Revert of Ozone support for device special cases in keyboard event rewriting. (patchset #6 id:12000…

ui/events/devices/x11/touch_factory_x11.h

 // 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.
 
 #ifndef UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_
 #define UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_
 
 #include <bitset>
 #include <map>
 #include <set>
@@ skipping 80 matching lines @@
 
   // Sets up the device id in the list |devices| as pointer devices.
   // This function is only for test purpose, and it does not query from
   // X server.
   void SetPointerDeviceForTest(const std::vector<int>& devices);
 
  private:
   // Requirement for Singleton
   friend struct DefaultSingletonTraits<TouchFactory>;
 
-  void CacheTouchscreenIds(int id);
+  void CacheTouchscreenIds(Display* display, int id);
 
   // NOTE: To keep track of touch devices, we currently maintain a lookup table
   // to quickly decide if a device is a touch device or not. We also maintain a
   // list of the touch devices. Ideally, there will be only one touch device,
   // and instead of having the lookup table and the list, there will be a single
   // identifier for the touch device. This can be completed after enough testing
   // on real touch devices.
 
   static const int kMaxDeviceNum = 128;
 
@@ skipping 21 matching lines @@
   int virtual_core_keyboard_device_;
 
   SequentialIDGenerator id_generator_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchFactory);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_DEVICES_X11_TOUCH_FACTORY_X11_H_