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

11 files changed, 74 insertions, 62 deletions

diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.cc
index da76989..3d103b2 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.cc
@@ -40,7 +40,8 @@ AutocompletePopupWin::~AutocompletePopupWin() {
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupWin, WidgetWin overrides:
 
-LRESULT AutocompletePopupWin::OnMouseActivate(HWND window, UINT hit_test,
-                                              UINT mouse_message) {
+LRESULT AutocompletePopupWin::OnMouseActivate(UINT message,
+                                              WPARAM w_param,
+                                              LPARAM l_param) {
   return MA_NOACTIVATE;
 }
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.h b/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.h
index bcb7af4..63b4282 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.h
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -23,9 +23,9 @@ class AutocompletePopupWin
 
  private:
   // Overridden from WidgetWin:
-  virtual LRESULT OnMouseActivate(HWND window,
-                                  UINT hit_test,
-                                  UINT mouse_message);
+  virtual LRESULT OnMouseActivate(UINT message,
+                                  WPARAM w_param,
+                                  LPARAM l_param) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWin);
 };
diff --git a/chrome/browser/ui/views/constrained_window_win.cc b/chrome/browser/ui/views/constrained_window_win.cc
index fe30134..7beb018 100644
--- a/chrome/browser/ui/views/constrained_window_win.cc
+++ b/chrome/browser/ui/views/constrained_window_win.cc
@@ -649,12 +649,13 @@ void ConstrainedWindowWin::OnFinalMessage(HWND window) {
   WindowWin::OnFinalMessage(window);
 }
 
-LRESULT ConstrainedWindowWin::OnMouseActivate(HWND window,
-                                               UINT hittest_code,
-                                               UINT message) {
+LRESULT ConstrainedWindowWin::OnMouseActivate(UINT message,
+                                              WPARAM w_param,
+                                              LPARAM l_param) {
   // We only detach the window if the user clicked on the title bar. That
   // way, users can click inside the contents of legitimate popups obtained
   // with a mouse gesture.
+  UINT hittest_code = static_cast<UINT>(LOWORD(l_param));
   if (hittest_code != HTCLIENT && hittest_code != HTNOWHERE &&
       hittest_code != HTCLOSE) {
     ActivateConstrainedWindow();
diff --git a/chrome/browser/ui/views/constrained_window_win.h b/chrome/browser/ui/views/constrained_window_win.h
index f6b6733..1875901 100644
--- a/chrome/browser/ui/views/constrained_window_win.h
+++ b/chrome/browser/ui/views/constrained_window_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -33,21 +33,24 @@ class ConstrainedWindowWin : public ConstrainedWindow,
   TabContents* owner() const { return owner_; }
 
   // Overridden from views::Window:
-  virtual views::NonClientFrameView* CreateFrameViewForWindow();
+  virtual views::NonClientFrameView* CreateFrameViewForWindow() OVERRIDE;
 
   // Overridden from ConstrainedWindow:
-  virtual void ShowConstrainedWindow();
-  virtual void CloseConstrainedWindow();
-  virtual void FocusConstrainedWindow();
+  virtual void ShowConstrainedWindow() OVERRIDE;
+  virtual void CloseConstrainedWindow() OVERRIDE;
+  virtual void FocusConstrainedWindow() OVERRIDE;
+
   virtual std::wstring GetWindowTitle() const;
   virtual const gfx::Rect& GetCurrentBounds() const;
 
  protected:
   // Windows message handlers:
-  virtual void OnDestroy();
-  virtual void OnFinalMessage(HWND window);
-  virtual LRESULT OnMouseActivate(HWND window, UINT hittest_code, UINT message);
-  virtual void OnWindowPosChanged(WINDOWPOS* window_pos);
+  virtual void OnDestroy() OVERRIDE;
+  virtual void OnFinalMessage(HWND window) OVERRIDE;
+  virtual LRESULT OnMouseActivate(UINT message,
+                                  WPARAM w_param,
+                                  LPARAM l_param) OVERRIDE;
+  virtual void OnWindowPosChanged(WINDOWPOS* window_pos) OVERRIDE;
 
  private:
   friend class ConstrainedWindow;
diff --git a/chrome/browser/ui/views/download_item_view.h b/chrome/browser/ui/views/download_item_view.h
index e8f427a..b92a74c 100644
--- a/chrome/browser/ui/views/download_item_view.h
+++ b/chrome/browser/ui/views/download_item_view.h
@@ -62,29 +62,32 @@ class DownloadItemView : public views::ButtonListener,
   virtual ~DownloadItemView();
 
   // DownloadObserver method
-  virtual void OnDownloadUpdated(DownloadItem* download);
-  virtual void OnDownloadFileCompleted(DownloadItem* download) { }
-  virtual void OnDownloadOpened(DownloadItem* download);
+  virtual void OnDownloadUpdated(DownloadItem* download) OVERRIDE;
+  virtual void OnDownloadFileCompleted(DownloadItem* download) OVERRIDE { }
+  virtual void OnDownloadOpened(DownloadItem* download) OVERRIDE;
 
   // View overrides
-  virtual void Layout();
-  virtual void OnPaint(gfx::Canvas* canvas);
-  virtual gfx::Size GetPreferredSize();
-  virtual void OnMouseExited(const views::MouseEvent& event);
-  virtual void OnMouseMoved(const views::MouseEvent& event);
-  virtual bool OnMousePressed(const views::MouseEvent& event);
-  virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
-  virtual bool OnMouseDragged(const views::MouseEvent& event);
-  virtual bool OnKeyPressed(const views::KeyEvent& e);
-  virtual void ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual AccessibilityTypes::State GetAccessibleState();
+  virtual void Layout() OVERRIDE;
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE;
+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseReleased(const views::MouseEvent& event,
+                               bool canceled) OVERRIDE;
+  virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
+  virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE;
+  virtual void ShowContextMenu(const gfx::Point& p,
+                               bool is_mouse_gesture) OVERRIDE;
+  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
+  virtual AccessibilityTypes::State GetAccessibleState() OVERRIDE;
 
   // ButtonListener implementation.
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+  virtual void ButtonPressed(views::Button* sender,
+                             const views::Event& event) OVERRIDE;
 
   // ui::AnimationDelegate implementation.
-  virtual void AnimationProgressed(const ui::Animation* animation);
+  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
 
   // Timer callback for handling animations
   void UpdateDownloadProgress();
diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc
index d60b767..139007a 100644
--- a/chrome/browser/ui/views/frame/browser_frame_win.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_win.cc
@@ -188,7 +188,8 @@ void BrowserFrameWin::OnInitMenuPopup(HMENU menu, UINT position,
   browser_view_->PrepareToRunSystemMenu(menu);
 }
 
-LRESULT BrowserFrameWin::OnMouseActivate(UINT message, WPARAM w_param,
+LRESULT BrowserFrameWin::OnMouseActivate(UINT message,
+                                         WPARAM w_param,
                                          LPARAM l_param) {
   return browser_view_->ActivateAppModalDialog() ? MA_NOACTIVATEANDEAT
                                                  : MA_ACTIVATE;
diff --git a/chrome/browser/ui/views/frame/browser_frame_win.h b/chrome/browser/ui/views/frame/browser_frame_win.h
index e2fbaa1..068f21f 100644
--- a/chrome/browser/ui/views/frame/browser_frame_win.h
+++ b/chrome/browser/ui/views/frame/browser_frame_win.h
@@ -56,15 +56,17 @@ class BrowserFrameWin : public BrowserFrame, public views::WindowWin {
   // Overridden from views::WindowWin:
   virtual int GetShowState() const OVERRIDE;
   virtual gfx::Insets GetClientAreaInsets() const OVERRIDE;
-  virtual bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator)
-      OVERRIDE;
+  virtual bool GetAccelerator(int cmd_id,
+                              ui::Accelerator* accelerator) OVERRIDE;
   virtual void OnEndSession(BOOL ending, UINT logoff) OVERRIDE;
   virtual void OnEnterSizeMove() OVERRIDE;
   virtual void OnExitSizeMove() OVERRIDE;
-  virtual void OnInitMenuPopup(HMENU menu, UINT position, BOOL is_system_menu)
-      OVERRIDE;
-  virtual LRESULT OnMouseActivate(UINT message, WPARAM w_param, LPARAM l_param)
-      OVERRIDE;
+  virtual void OnInitMenuPopup(HMENU menu,
+                               UINT position,
+                               BOOL is_system_menu) OVERRIDE;
+  virtual LRESULT OnMouseActivate(UINT message,
+                                  WPARAM w_param,
+                                  LPARAM l_param) OVERRIDE;
   virtual void OnMove(const CPoint& point) OVERRIDE;
   virtual void OnMoving(UINT param, LPRECT new_bounds) OVERRIDE;
   virtual LRESULT OnNCActivate(BOOL active) OVERRIDE;
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble.cc b/chrome/browser/ui/views/fullscreen_exit_bubble.cc
index fa85636..7cf2afb9 100644
--- a/chrome/browser/ui/views/fullscreen_exit_bubble.cc
+++ b/chrome/browser/ui/views/fullscreen_exit_bubble.cc
@@ -114,9 +114,9 @@ class FullscreenExitBubble::FullscreenExitPopup : public views::WidgetWin {
   virtual ~FullscreenExitPopup() {}
 
   // views::WidgetWin:
-  virtual LRESULT OnMouseActivate(HWND window,
-                                  UINT hittest_code,
-                                  UINT message) {
+  virtual LRESULT OnMouseActivate(UINT message,
+                                  WPARAM w_param,
+                                  LPARAM l_param) OVERRIDE {
     // Prevent the popup from being activated, so it won't steal focus from the
     // rest of the browser, and doesn't cause problems with the FocusManager's
     // "RestoreFocusedView()" functionality.
diff --git a/chrome/browser/ui/views/info_bubble.cc b/chrome/browser/ui/views/info_bubble.cc
index d7ad4af..90c099c 100644
--- a/chrome/browser/ui/views/info_bubble.cc
+++ b/chrome/browser/ui/views/info_bubble.cc
@@ -231,9 +231,9 @@ gfx::Rect BorderWidget::SizeAndGetBounds(
   return contents_bounds;
 }
 
-LRESULT BorderWidget::OnMouseActivate(HWND window,
-                                      UINT hit_test,
-                                      UINT mouse_message) {
+LRESULT BorderWidget::OnMouseActivate(UINT message,
+                                      WPARAM w_param,
+                                      LPARAM l_param) {
   // Never activate.
   return MA_NOACTIVATE;
 }
diff --git a/chrome/browser/ui/views/info_bubble.h b/chrome/browser/ui/views/info_bubble.h
index f8c8571..00aa598 100644
--- a/chrome/browser/ui/views/info_bubble.h
+++ b/chrome/browser/ui/views/info_bubble.h
@@ -143,9 +143,9 @@ class BorderWidget : public views::WidgetWin {
 
  private:
   // Overridden from WidgetWin:
-  virtual LRESULT OnMouseActivate(HWND window,
-                                  UINT hit_test,
-                                  UINT mouse_message);
+  virtual LRESULT OnMouseActivate(UINT message,
+                                  WPARAM w_param,
+                                  LPARAM l_param) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(BorderWidget);
 };
diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h
index 6eb1765d..4b20f53 100644
--- a/chrome/browser/ui/views/tabs/tab.h
+++ b/chrome/browser/ui/views/tabs/tab.h
@@ -57,20 +57,21 @@ class Tab : public BaseTab {
 
  protected:
   // BaseTab overrides:
-  virtual const gfx::Rect& GetTitleBounds() const;
-  virtual const gfx::Rect& GetIconBounds() const;
-  virtual void DataChanged(const TabRendererData& old);
+  virtual const gfx::Rect& GetTitleBounds() const OVERRIDE;
+  virtual const gfx::Rect& GetIconBounds() const OVERRIDE;
+  virtual void DataChanged(const TabRendererData& old) OVERRIDE;
 
  private:
   // Overridden from views::View:
-  virtual void OnPaint(gfx::Canvas* canvas);
-  virtual void Layout();
-  virtual void OnThemeChanged();
-  virtual std::string GetClassName() const;
-  virtual bool HasHitTestMask() const;
-  virtual void GetHitTestMask(gfx::Path* path) const;
-  virtual bool GetTooltipTextOrigin(const gfx::Point& p, gfx::Point* origin);
-  virtual void OnMouseMoved(const views::MouseEvent& event);
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void OnThemeChanged() OVERRIDE;
+  virtual std::string GetClassName() const OVERRIDE;
+  virtual bool HasHitTestMask() const OVERRIDE;
+  virtual void GetHitTestMask(gfx::Path* path) const OVERRIDE;
+  virtual bool GetTooltipTextOrigin(const gfx::Point& p,
+                                    gfx::Point* origin) OVERRIDE;
+  virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE;
 
   // Paint various portions of the Tab
   void PaintTabBackground(gfx::Canvas* canvas);