Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / aura / env.h

diff --git a/src/ui/aura/env.h b/src/ui/aura/env.h
index e857da6..f04c7a5 100644 (file)
--- a/src/ui/aura/env.h
+++ b/src/ui/aura/env.h
@@ -72,7 +72,7 @@ class AURA_EXPORT Env : public ui::EventTarget, public base::SupportsUserData {
   friend class WindowTreeHost;
 
   Env();
-  virtual ~Env();
+  ~Env() override;
 
   // See description of CreateInstance() for deatils of |create_event_source|.
   void Init(bool create_event_source);
@@ -87,10 +87,10 @@ class AURA_EXPORT Env : public ui::EventTarget, public base::SupportsUserData {
   void NotifyHostActivated(WindowTreeHost* host);
 
   // Overridden from ui::EventTarget:
-  virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE;
-  virtual ui::EventTarget* GetParentTarget() OVERRIDE;
-  virtual scoped_ptr<ui::EventTargetIterator> GetChildIterator() const OVERRIDE;
-  virtual ui::EventTargeter* GetEventTargeter() OVERRIDE;
+  bool CanAcceptEvent(const ui::Event& event) override;
+  ui::EventTarget* GetParentTarget() override;
+  scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override;
+  ui::EventTargeter* GetEventTargeter() override;
 
   ObserverList<EnvObserver> observers_;