Consolidate Widget Event code, other cleanup.

views/controls/menu/menu_host_gtk.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_gtk.h"
 
 #include <gdk/gdk.h>
 
 #if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
 #include <gdk/gdkx.h>
@@ skipping 18 matching lines @@
 
 MenuHostGtk::MenuHostGtk(SubmenuView* submenu)
     : WidgetGtk(WidgetGtk::TYPE_POPUP),
       destroying_(false),
       submenu_(submenu),
       did_input_grab_(false) {
   GdkEvent* event = gtk_get_current_event();
   if (event) {
     if (event->type == GDK_BUTTON_PRESS || event->type == GDK_2BUTTON_PRESS ||
         event->type == GDK_3BUTTON_PRESS) {
-      set_mouse_down(true);
+      is_mouse_button_pressed_ = true;
     }
     gdk_event_free(event);
   }
   CreateParams params;
   params.type = CreateParams::TYPE_MENU;
   params.has_dropshadow = true;
   SetCreateParams(params);
 }
 
 MenuHostGtk::~MenuHostGtk() {
@@ skipping 39 matching lines @@
   // window now, it means AcceleratorHandler attempts to use a window that has
   // been destroyed.
   Close();
 }
 
 void MenuHostGtk::SetMenuHostBounds(const gfx::Rect& bounds) {
   SetBounds(bounds);
 }
 
 void MenuHostGtk::ReleaseMenuHostCapture() {
-  ReleaseNativeCapture();
+  ReleaseMouseCapture();
 }
 
 gfx::NativeWindow MenuHostGtk::GetMenuHostWindow() {
   return GTK_WINDOW(GetNativeView());
 }
 
 RootView* MenuHostGtk::CreateRootView() {
   return new MenuHostRootView(this, submenu_);
 }
 
-bool MenuHostGtk::ReleaseCaptureOnMouseReleased() {
+bool MenuHostGtk::ShouldReleaseCaptureOnMouseReleased() const {
   return false;
 }
 
-void MenuHostGtk::ReleaseNativeCapture() {
-  WidgetGtk::ReleaseNativeCapture();
+void MenuHostGtk::ReleaseMouseCapture() {
+  WidgetGtk::ReleaseMouseCapture();
   if (did_input_grab_) {
     did_input_grab_ = false;
     gdk_pointer_ungrab(GDK_CURRENT_TIME);
     gdk_keyboard_ungrab(GDK_CURRENT_TIME);
 #if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
     TouchFactory::GetInstance()->UngrabTouchDevices(
         GDK_WINDOW_XDISPLAY(window_contents()->window));
 #endif
   }
 }
@@ skipping 13 matching lines @@
   if (did_input_grab_ && !destroying_) {
     did_input_grab_ = false;
     CancelAllIfNoDrag();
   }
   WidgetGtk::HandleXGrabBroke();
 }
 
 void MenuHostGtk::HandleGtkGrabBroke() {
   // Grab can be broken by drag & drop, other menu or screen locker.
   if (did_input_grab_ && !destroying_) {
-    ReleaseNativeCapture();
+    ReleaseMouseCapture();
     CancelAllIfNoDrag();
   }
   WidgetGtk::HandleGtkGrabBroke();
 }
 
 void MenuHostGtk::DoCapture() {
   DCHECK(!did_input_grab_);
 
   // Release the current grab.
   GtkWidget* current_grab_window = gtk_grab_get_current();
   if (current_grab_window)
     gtk_grab_remove(current_grab_window);
 
   // Make sure all app mouse/keyboard events are targetted at us only.
-  SetNativeCapture();
+  SetMouseCapture();
 
   // And do a grab.  NOTE: we do this to ensure we get mouse/keyboard
   // events from other apps, a grab done with gtk_grab_add doesn't get
   // events from other apps.
   GdkGrabStatus pointer_grab_status =
       gdk_pointer_grab(window_contents()->window, FALSE,
                        static_cast<GdkEventMask>(
                            GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
                            GDK_POINTER_MOTION_MASK),
                        NULL, NULL, GDK_CURRENT_TIME);
@@ skipping 20 matching lines @@
 
 void MenuHostGtk::CancelAllIfNoDrag() {
   MenuController* menu_controller =
       submenu_->GetMenuItem()->GetMenuController();
   if (menu_controller &&
       !menu_controller->drag_in_progress())
     menu_controller->CancelAll();
 }
 
 }  // namespace views