Revert 71879 due to compile failure - touch: Allow grabbing/ungrabbing touch ...

views/controls/menu/menu_host_gtk.cc

 // Copyright (c) 2010 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)
-#include <gdk/gdkx.h>
-#include <X11/extensions/XInput2.h>
-#endif
-
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host_root_view.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/submenu_view.h"
 
-#if defined(HAVE_XINPUT2)
-#include "views/touchui/touch_factory.h"
-#endif
-
 namespace views {
 
 // static
 MenuHost* MenuHost::Create(SubmenuView* submenu_view) {
   return new MenuHostGtk(submenu_view);
 }
 
 MenuHostGtk::MenuHostGtk(SubmenuView* submenu)
     : WidgetGtk(WidgetGtk::TYPE_POPUP),
       destroying_(false),
@@ skipping 73 matching lines @@
 bool MenuHostGtk::ReleaseCaptureOnMouseReleased() {
   return false;
 }
 
 void MenuHostGtk::ReleaseGrab() {
   WidgetGtk::ReleaseGrab();
   if (did_input_grab_) {
     did_input_grab_ = false;
     gdk_pointer_ungrab(GDK_CURRENT_TIME);
     gdk_keyboard_ungrab(GDK_CURRENT_TIME);
-#if defined(HAVE_XINPUT2)
-    TouchFactory::GetInstance()->UngrabTouchDevices(
-        GDK_WINDOW_XDISPLAY(window_contents()->window));
-#endif
   }
 }
 
 void MenuHostGtk::OnDestroy(GtkWidget* object) {
   if (!destroying_) {
     // We weren't explicitly told to destroy ourselves, which means the menu was
     // deleted out from under us (the window we're parented to was closed). Tell
     // the SubmenuView to drop references to us.
     submenu_->MenuHostDestroyed();
   }
@@ skipping 27 matching lines @@
                        static_cast<GdkEventMask>(
                            GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
                            GDK_POINTER_MOTION_MASK),
                        NULL, NULL, GDK_CURRENT_TIME);
   GdkGrabStatus keyboard_grab_status =
       gdk_keyboard_grab(window_contents()->window, FALSE,
                         GDK_CURRENT_TIME);
 
   did_input_grab_ = pointer_grab_status == GDK_GRAB_SUCCESS &&
       keyboard_grab_status == GDK_GRAB_SUCCESS;
-
-#if defined(HAVE_XINPUT2)
-  ::Window window = GDK_WINDOW_XID(window_contents()->window);
-  Display* display = GDK_WINDOW_XDISPLAY(window_contents()->window);
-  bool xi2grab = TouchFactory::GetInstance()->GrabTouchDevices(display, window);
-  did_input_grab_ = did_input_grab_ && xi2grab;
-#endif
-
   DCHECK(did_input_grab_);
   // need keyboard grab.
 }
 
 }  // namespace views