| Index: ui/aura/env.h
|
| diff --git a/ui/aura/env.h b/ui/aura/env.h
|
| index e857da6a7bd6d696b79b42e9774a227015765713..480c6cb3f24a82bf5283450dcc2e0be492f5c1cb 100644
|
| --- a/ui/aura/env.h
|
| +++ b/ui/aura/env.h
|
| @@ -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;
|
| + 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;
|
|
|
| ObserverList<EnvObserver> observers_;
|
|
|
|
|