aura-x11: Select for non-touch events before selecting for touch events.

ui/base/touch/touch_factory.cc

 // Copyright (c) 2012 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 "ui/base/touch/touch_factory.h"
 
 #include <X11/cursorfont.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/XIproto.h>
@@ skipping 35 matching lines @@
 #endif
 
   Display* display = GetXDisplay();
 
   invisible_cursor_ = CreateInvisibleCursor();
   arrow_cursor_ = XCreateFontCursor(display, XC_arrow);
 
   SetCursorVisible(false, false);
   UpdateDeviceList(display);
 
-  // Make sure the list of devices is kept up-to-date by listening for
-  // XI_HierarchyChanged event on the root window.
-  unsigned char mask[XIMaskLen(XI_LASTEVENT)];
-  memset(mask, 0, sizeof(mask));
-
-  XISetMask(mask, XI_HierarchyChanged);
-
-  XIEventMask evmask;
-  evmask.deviceid = XIAllDevices;
-  evmask.mask_len = sizeof(mask);
-  evmask.mask = mask;
-  XISelectEvents(display, ui::GetX11RootWindow(), &evmask, 1);
-
   CommandLine* cmdline = CommandLine::ForCurrentProcess();
   touch_events_disabled_ = cmdline->HasSwitch(switches::kTouchEvents) &&
       cmdline->GetSwitchValueASCII(switches::kTouchEvents) ==
           switches::kTouchEventsDisabled;
 }
 
 TouchFactory::~TouchFactory() {
 #if defined(USE_AURA)
   if (!base::MessagePumpForUI::HasXInput2())
     return;
@@ skipping 316 matching lines @@
     XDefineCursor(display, window, arrow_cursor_);
   else if (touch_device_available_)
     XDefineCursor(display, window, invisible_cursor_);
 }
 
 bool TouchFactory::IsTouchDevicePresent() {
   return !touch_events_disabled_ && touch_device_available_;
 }
 
 }  // namespace ui