Consolidate Widget Event code, other cleanup.

views/controls/menu/menu_host_win.cc

 // 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.
 
 #include "views/controls/menu/menu_host_win.h"
 
 #include "base/win/windows_version.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host_root_view.h"
 #include "views/controls/menu/menu_item_view.h"
@@ skipping 89 matching lines @@
 
 void MenuHostWin::OnCancelMode() {
   submenu_->GetMenuItem()->GetMenuController()->Cancel(
       MenuController::EXIT_ALL);
 }
 
 RootView* MenuHostWin::CreateRootView() {
   return new MenuHostRootView(this, submenu_);
 }
 
-bool MenuHostWin::ReleaseCaptureOnMouseReleased() {
+bool MenuHostWin::ShouldReleaseCaptureOnMouseReleased() const {
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuHostWin, private:
 
 void MenuHostWin::DoCapture() {
   owns_capture_ = true;
-  SetNativeCapture();
+  SetMouseCapture();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuHost, public:
 
 // static
 NativeMenuHost* NativeMenuHost::CreateNativeMenuHost(SubmenuView* submenu) {
   return new MenuHostWin(submenu);
 }
 
 }  // namespace views