diff options
| author | mostynb <mostynb@opera.com> | 2014-10-09 03:54:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-09 10:55:07 +0000 |
| commit | 3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6 (patch) | |
| tree | 720b6c8d126123e087abffedaedd8a9fa4907132 /ui/aura/env.h | |
| parent | 002d02909368b7067cc3df9149c5e46ce445861c (diff) | |
| download | chromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.zip chromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.tar.gz chromium_src-3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in ui/
BUG=417463
Review URL: https://codereview.chromium.org/623293004
Cr-Commit-Position: refs/heads/master@{#298839}
Diffstat (limited to 'ui/aura/env.h')
| -rw-r--r-- | ui/aura/env.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/aura/env.h b/ui/aura/env.h index e857da6..480c6cb 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_; |