Consolidate Widget Event code, other cleanup.

views/controls/menu/menu_host_win.h

Index: views/controls/menu/menu_host_win.h
diff --git a/views/controls/menu/menu_host_win.h b/views/controls/menu/menu_host_win.h
index 9b0451f28bdbb41e8178da388946e1fa7aa31b23..fd3fa7b3607c5f486f1b9a746836ada99fc3b7ef 100644
--- a/views/controls/menu/menu_host_win.h
+++ b/views/controls/menu/menu_host_win.h
@@ -1,8 +1,7 @@
-// Copyright (c) 2009 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.
 
-
 #ifndef VIEWS_CONTROLS_MENU_MENU_HOST_WIN_H_
 #define VIEWS_CONTROLS_MENU_MENU_HOST_WIN_H_
 #pragma once
@@ -20,30 +19,30 @@ class MenuHostWin : public WidgetWin, public MenuHost {
   explicit MenuHostWin(SubmenuView* submenu);
   virtual ~MenuHostWin();
 
-  // MenuHost overrides:
+  // Overridden from MenuHost:
   virtual void InitMenuHost(HWND parent,
                             const gfx::Rect& bounds,
                             View* contents_view,
-                            bool do_capture);
-  virtual bool IsMenuHostVisible();
-  virtual void ShowMenuHost(bool do_capture);
-  virtual void HideMenuHost();
-  virtual void DestroyMenuHost();
-  virtual void SetMenuHostBounds(const gfx::Rect& bounds);
-  virtual void ReleaseMenuHostCapture();
-  virtual gfx::NativeWindow GetMenuHostWindow();
-
-  // WidgetWin overrides:
-  virtual void OnDestroy();
-  virtual void OnCaptureChanged(HWND hwnd);
-  virtual void OnCancelMode();
+                            bool do_capture) OVERRIDE;
+  virtual bool IsMenuHostVisible() OVERRIDE;
+  virtual void ShowMenuHost(bool do_capture) OVERRIDE;
+  virtual void HideMenuHost() OVERRIDE;
+  virtual void DestroyMenuHost() OVERRIDE;
+  virtual void SetMenuHostBounds(const gfx::Rect& bounds) OVERRIDE;
+  virtual void ReleaseMenuHostCapture() OVERRIDE;
+  virtual gfx::NativeWindow GetMenuHostWindow() OVERRIDE;
+
+  // Overridden from WidgetWin:
+  virtual void OnDestroy() OVERRIDE;
+  virtual void OnCaptureChanged(HWND hwnd) OVERRIDE;
+  virtual void OnCancelMode() OVERRIDE;
 
  protected:
-  virtual RootView* CreateRootView();
+  // Overridden from Widget:
+  virtual RootView* CreateRootView() OVERRIDE;
 
-  // Overriden to return false, we do NOT want to release capture on mouse
-  // release.
-  virtual bool ReleaseCaptureOnMouseReleased();
+  // Overridden from NativeWidget:
+  virtual bool ShouldReleaseCaptureOnMouseReleased() const OVERRIDE;
 
  private:
   void DoCapture();