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

6 files changed, 38 insertions, 26 deletions

diff --git a/views/controls/button/custom_button.h b/views/controls/button/custom_button.h
index 17dafbf..8dafcf5 100644
--- a/views/controls/button/custom_button.h
+++ b/views/controls/button/custom_button.h
@@ -102,7 +102,8 @@ class CustomButton : public Button,
   virtual void OnDragDone() OVERRIDE;
   virtual void ShowContextMenu(const gfx::Point& p,
                                bool is_mouse_gesture) OVERRIDE;
-  virtual void ViewHierarchyChanged(bool is_add, View* parent,
+  virtual void ViewHierarchyChanged(bool is_add,
+                                    View* parent,
                                     View* child) OVERRIDE;
   virtual void SetHotTracked(bool flag) OVERRIDE;
   virtual bool IsHotTracked() const OVERRIDE;
diff --git a/views/controls/label.h b/views/controls/label.h
index 1bb2b59..017b33c7 100644
--- a/views/controls/label.h
+++ b/views/controls/label.h
@@ -156,9 +156,9 @@ class Label : public View {
 
   // Mouse enter/exit are overridden to render mouse over background color.
   // These invoke SetContainsMouse as necessary.
-  virtual void OnMouseMoved(const MouseEvent& e);
-  virtual void OnMouseEntered(const MouseEvent& event);
-  virtual void OnMouseExited(const MouseEvent& event);
+  virtual void OnMouseMoved(const MouseEvent& e) OVERRIDE;
+  virtual void OnMouseEntered(const MouseEvent& event) OVERRIDE;
+  virtual void OnMouseExited(const MouseEvent& event) OVERRIDE;
 
   // The background color to use when the mouse is over the label. Label
   // takes ownership of the Background.
diff --git a/views/controls/menu/menu_host_root_view.h b/views/controls/menu/menu_host_root_view.h
index c2b06f1..00648b4 100644
--- a/views/controls/menu/menu_host_root_view.h
+++ b/views/controls/menu/menu_host_root_view.h
@@ -28,12 +28,12 @@ class MenuHostRootView : public RootView {
     suspend_events_ = true;
   }
 
-  virtual bool OnMousePressed(const MouseEvent& event);
-  virtual bool OnMouseDragged(const MouseEvent& event);
-  virtual void OnMouseReleased(const MouseEvent& event, bool canceled);
-  virtual void OnMouseMoved(const MouseEvent& event);
-  virtual bool OnMouseWheel(const MouseWheelEvent& e);
-  virtual void ProcessOnMouseExited();
+  virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE;
+  virtual bool OnMouseDragged(const MouseEvent& event) OVERRIDE;
+  virtual void OnMouseReleased(const MouseEvent& event, bool canceled) OVERRIDE;
+  virtual void OnMouseMoved(const MouseEvent& event) OVERRIDE;
+  virtual bool OnMouseWheel(const MouseWheelEvent& e) OVERRIDE;
+  virtual void ProcessOnMouseExited() OVERRIDE;
 
  private:
   // Returns the MenuController for this MenuHostRootView.
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index 2047d40..60c5b56 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -730,7 +730,8 @@ void NativeTextfieldWin::OnMouseLeave() {
   SetContainsMouse(false);
 }
 
-LRESULT NativeTextfieldWin::OnMouseWheel(UINT message, WPARAM w_param,
+LRESULT NativeTextfieldWin::OnMouseWheel(UINT message,
+                                         WPARAM w_param,
                                          LPARAM l_param) {
   // Reroute the mouse-wheel to the window under the mouse pointer if
   // applicable.
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index e6e450b..15b63f6 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -231,7 +231,8 @@ class WidgetWin : public ui::WindowImpl,
 
   // Overridden from WindowImpl:
   virtual HICON GetDefaultWindowIcon() const OVERRIDE;
-  virtual LRESULT OnWndProc(UINT message, WPARAM w_param,
+  virtual LRESULT OnWndProc(UINT message,
+                            WPARAM w_param,
                             LPARAM l_param) OVERRIDE;
 
   // Message Handlers ----------------------------------------------------------
diff --git a/views/window/window_win.h b/views/window/window_win.h
index 2208405..5224f1f 100644
--- a/views/window/window_win.h
+++ b/views/window/window_win.h
@@ -122,30 +122,39 @@ class WindowWin : public WidgetWin,
   // Overridden from WidgetWin:
   virtual void OnActivate(UINT action, BOOL minimized, HWND window) OVERRIDE;
   virtual void OnActivateApp(BOOL active, DWORD thread_id) OVERRIDE;
-  virtual LRESULT OnAppCommand(HWND window, short app_command, WORD device,
+  virtual LRESULT OnAppCommand(HWND window,
+                               short app_command,
+                               WORD device,
                                int keystate) OVERRIDE;
-  virtual void OnCommand(UINT notification_code, int command_id, HWND window)
-      OVERRIDE;
+  virtual void OnCommand(UINT notification_code,
+                         int command_id,
+                         HWND window) OVERRIDE;
   virtual void OnDestroy() OVERRIDE;
-  virtual LRESULT OnDwmCompositionChanged(UINT msg, WPARAM w_param,
+  virtual LRESULT OnDwmCompositionChanged(UINT msg,
+                                          WPARAM w_param,
                                           LPARAM l_param) OVERRIDE;
   virtual void OnFinalMessage(HWND window) OVERRIDE;
   virtual void OnGetMinMaxInfo(MINMAXINFO* minmax_info) OVERRIDE;
   virtual void OnInitMenu(HMENU menu) OVERRIDE;
-  virtual LRESULT OnMouseLeave(UINT message, WPARAM w_param, LPARAM l_param)
-      OVERRIDE;
-  virtual LRESULT OnMouseRange(UINT message, WPARAM w_param, LPARAM l_param)
-      OVERRIDE;
+  virtual LRESULT OnMouseLeave(UINT message,
+                               WPARAM w_param,
+                               LPARAM l_param) OVERRIDE;
+  virtual LRESULT OnMouseRange(UINT message,
+                               WPARAM w_param,
+                               LPARAM l_param) OVERRIDE;
   virtual LRESULT OnNCActivate(BOOL active) OVERRIDE;
   LRESULT OnNCCalcSize(BOOL mode, LPARAM l_param);  // Don't override.
   virtual LRESULT OnNCHitTest(const CPoint& point) OVERRIDE;
   virtual void OnNCPaint(HRGN rgn) OVERRIDE;
-  virtual LRESULT OnNCMouseRange(UINT message, WPARAM w_param, LPARAM l_param)
-      OVERRIDE;
-  virtual LRESULT OnNCUAHDrawCaption(UINT msg, WPARAM w_param, LPARAM l_param)
-      OVERRIDE;
-  virtual LRESULT OnNCUAHDrawFrame(UINT msg, WPARAM w_param, LPARAM l_param)
-      OVERRIDE;
+  virtual LRESULT OnNCMouseRange(UINT message,
+                                 WPARAM w_param,
+                                 LPARAM l_param) OVERRIDE;
+  virtual LRESULT OnNCUAHDrawCaption(UINT msg,
+                                     WPARAM w_param,
+                                     LPARAM l_param) OVERRIDE;
+  virtual LRESULT OnNCUAHDrawFrame(UINT msg,
+                                   WPARAM w_param,
+                                   LPARAM l_param) OVERRIDE;
   virtual LRESULT OnSetIcon(UINT size_type, HICON new_icon) OVERRIDE;
   virtual LRESULT OnSetText(const wchar_t* text) OVERRIDE;
   virtual void OnSettingChange(UINT flags, const wchar_t* section) OVERRIDE;