diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 04:58:43 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 04:58:43 +0000 |
| commit | 727cdda723471131820151e766ac30a79cf7214a (patch) | |
| tree | 0635a73818b3f5642ece6438d8bf45e0336d6e20 /ui | |
| parent | 179cbaf54b1b96f5352b801d49daf2ffa663795a (diff) | |
| download | chromium_src-727cdda723471131820151e766ac30a79cf7214a.zip chromium_src-727cdda723471131820151e766ac30a79cf7214a.tar.gz chromium_src-727cdda723471131820151e766ac30a79cf7214a.tar.bz2 | |
Update OnMouseActivate override signatures.
Add OVERRIDE keyword liberally to some relevant overrides.
Fix copyright dates.
BUG=75366
TEST=Omnibox clicking, etc.
Review URL: http://codereview.chromium.org/6648018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/widget/root_view.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/ui/views/widget/root_view.h b/ui/views/widget/root_view.h index 2fe5c66..59ac133 100644 --- a/ui/views/widget/root_view.h +++ b/ui/views/widget/root_view.h @@ -26,25 +26,25 @@ class RootView : public View, virtual ~RootView(); // Overridden from View: - virtual void OnViewRemoved(View* parent, View* child); - virtual bool OnKeyPressed(const KeyEvent& event); - virtual bool OnKeyReleased(const KeyEvent& event); - virtual bool OnMouseWheel(const MouseWheelEvent& event); - virtual bool OnMousePressed(const MouseEvent& event); - virtual bool OnMouseDragged(const MouseEvent& event); - virtual void OnMouseReleased(const MouseEvent& event); - virtual void OnMouseCaptureLost(); - virtual void OnMouseMoved(const MouseEvent& event); - virtual void OnMouseExited(const MouseEvent& event); - virtual void Paint(gfx::Canvas* canvas); - virtual void InvalidateRect(const gfx::Rect& invalid_rect); - virtual Widget* GetWidget() const; + virtual void OnViewRemoved(View* parent, View* child) OVERRIDE; + virtual bool OnKeyPressed(const KeyEvent& event) OVERRIDE; + virtual bool OnKeyReleased(const KeyEvent& event) OVERRIDE; + virtual bool OnMouseWheel(const MouseWheelEvent& event) OVERRIDE; + virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE; + virtual bool OnMouseDragged(const MouseEvent& event) OVERRIDE; + virtual void OnMouseReleased(const MouseEvent& event) OVERRIDE; + virtual void OnMouseCaptureLost() OVERRIDE; + virtual void OnMouseMoved(const MouseEvent& event) OVERRIDE; + virtual void OnMouseExited(const MouseEvent& event) OVERRIDE; + virtual void Paint(gfx::Canvas* canvas) OVERRIDE; + virtual void InvalidateRect(const gfx::Rect& invalid_rect) OVERRIDE; + virtual Widget* GetWidget() const OVERRIDE; private: // Overridden from FocusTraversable: - virtual const FocusSearch* GetFocusSearch() const; - virtual FocusTraversable* GetFocusTraversableParent() const; - virtual View* GetFocusTraversableParentView() const; + virtual const FocusSearch* GetFocusSearch() const OVERRIDE; + virtual FocusTraversable* GetFocusTraversableParent() const OVERRIDE; + virtual View* GetFocusTraversableParentView() const OVERRIDE; Widget* widget_; |