diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 18:07:30 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 18:07:30 +0000 |
| commit | 1b5ae45bb9785e6be6b3d2904fbb5f323b2d487d (patch) | |
| tree | 10cc8645ab2fed663af9207d2caa2a1bc1db18ac /ui/views/focus | |
| parent | addc1be9629d2e030a853eefecf6997a229b91b9 (diff) | |
| download | chromium_src-1b5ae45bb9785e6be6b3d2904fbb5f323b2d487d.zip chromium_src-1b5ae45bb9785e6be6b3d2904fbb5f323b2d487d.tar.gz chromium_src-1b5ae45bb9785e6be6b3d2904fbb5f323b2d487d.tar.bz2 | |
Add OVERRIDE to ui/.
BUG=104314
TEST=no change
Review URL: http://codereview.chromium.org/8632024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/focus')
| -rw-r--r-- | ui/views/focus/accelerator_handler.h | 10 | ||||
| -rw-r--r-- | ui/views/focus/external_focus_tracker.h | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/ui/views/focus/accelerator_handler.h b/ui/views/focus/accelerator_handler.h index 7be2029..cd4dd71 100644 --- a/ui/views/focus/accelerator_handler.h +++ b/ui/views/focus/accelerator_handler.h @@ -15,6 +15,7 @@ #include <set> #include <vector> +#include "base/compiler_specific.h" #include "base/message_loop.h" #include "views/views_export.h" @@ -35,14 +36,15 @@ class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher { // Dispatcher method. This returns true if an accelerator was processed by the // focus manager #if defined(OS_WIN) - virtual bool Dispatch(const MSG& msg); + virtual bool Dispatch(const MSG& msg) OVERRIDE; #elif defined(USE_WAYLAND) virtual base::MessagePumpDispatcher::DispatchStatus Dispatch( - base::wayland::WaylandEvent* ev); + base::wayland::WaylandEvent* ev) OVERRIDE; #elif defined(USE_AURA) - virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xev); + virtual base::MessagePumpDispatcher::DispatchStatus Dispatch( + XEvent* xev) OVERRIDE; #else - virtual bool Dispatch(GdkEvent* event); + virtual bool Dispatch(GdkEvent* event) OVERRIDE; #endif private: diff --git a/ui/views/focus/external_focus_tracker.h b/ui/views/focus/external_focus_tracker.h index d8493c7..2b0b4c2 100644 --- a/ui/views/focus/external_focus_tracker.h +++ b/ui/views/focus/external_focus_tracker.h @@ -6,6 +6,7 @@ #define UI_VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_ #pragma once +#include "base/compiler_specific.h" #include "ui/views/focus/focus_manager.h" namespace views { @@ -32,8 +33,10 @@ class VIEWS_EXPORT ExternalFocusTracker : public FocusChangeListener { virtual ~ExternalFocusTracker(); // FocusChangeListener implementation. - virtual void OnWillChangeFocus(View* focused_before, View* focused_now); - virtual void OnDidChangeFocus(View* focused_before, View* focused_now); + virtual void OnWillChangeFocus(View* focused_before, + View* focused_now) OVERRIDE; + virtual void OnDidChangeFocus(View* focused_before, + View* focused_now) OVERRIDE; // Focuses last focused view which is not a child of parent view and is not // parent view itself. Returns true if focus for a view was requested, false |