summaryrefslogtreecommitdiffstats
path: root/ui/keyboard/keyboard_controller_proxy.h
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-09 03:54:27 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-09 10:55:07 +0000
commit3b3d52b1844d5174f63a1db8cf3f0e3254ec43f6 (patch)
tree720b6c8d126123e087abffedaedd8a9fa4907132 /ui/keyboard/keyboard_controller_proxy.h
parent002d02909368b7067cc3df9149c5e46ce445861c (diff)
downloadchromium_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/keyboard/keyboard_controller_proxy.h')
-rw-r--r--ui/keyboard/keyboard_controller_proxy.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/keyboard/keyboard_controller_proxy.h b/ui/keyboard/keyboard_controller_proxy.h
index d7886e2..f893eea 100644
--- a/ui/keyboard/keyboard_controller_proxy.h
+++ b/ui/keyboard/keyboard_controller_proxy.h
@@ -115,8 +115,8 @@ class KEYBOARD_EXPORT KeyboardControllerProxy : public aura::WindowObserver {
// aura::WindowObserver overrides:
virtual void OnWindowBoundsChanged(aura::Window* window,
const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) OVERRIDE;
- virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
+ const gfx::Rect& new_bounds) override;
+ virtual void OnWindowDestroyed(aura::Window* window) override;
private:
friend class TestApi;