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

ui/events/ozone/evdev/keyboard_evdev.h

 // Copyright 2014 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_OZONE_EVDEV_KEYBOARD_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_KEYBOARD_EVDEV_H_
 
 #include <bitset>
 #include <linux/input.h>
 
@@ skipping 16 matching lines @@
 //
 // It also currently also applies the layout.
 class EVENTS_OZONE_EVDEV_EXPORT KeyboardEvdev {
  public:
   KeyboardEvdev(EventModifiersEvdev* modifiers,
                 KeyboardLayoutEngine* keyboard_layout_engine,
                 const EventDispatchCallback& callback);
   ~KeyboardEvdev();
 
   // Handlers for raw key presses & releases.
-  void OnKeyChange(unsigned int code,
-                   bool down,
-                   base::TimeDelta timestamp,
-                   int device_id);
+  void OnKeyChange(unsigned int code, bool down, base::TimeDelta timestamp);
 
   // Handle Caps Lock modifier.
   void SetCapsLockEnabled(bool enabled);
   bool IsCapsLockEnabled();
 
   // Configuration for key repeat.
   bool IsAutoRepeatEnabled();
   void SetAutoRepeatEnabled(bool enabled);
   void SetAutoRepeatRate(const base::TimeDelta& delay,
                          const base::TimeDelta& interval);
   void GetAutoRepeatRate(base::TimeDelta* delay, base::TimeDelta* interval);
 
  private:
   void UpdateModifier(int modifier_flag, bool down);
   void UpdateCapsLockLed();
-  void UpdateKeyRepeat(unsigned int key, bool down, int device_id);
-  void StartKeyRepeat(unsigned int key, int device_id);
+  void UpdateKeyRepeat(unsigned int key, bool down);
+  void StartKeyRepeat(unsigned int key);
   void StopKeyRepeat();
   void ScheduleKeyRepeat(const base::TimeDelta& delay);
   void OnRepeatTimeout(unsigned int sequence);
   void DispatchKey(unsigned int key,
                    bool down,
                    bool repeat,
-                   base::TimeDelta timestamp,
-                   int device_id);
+                   base::TimeDelta timestamp);
 
   // Aggregated key state. There is only one bit of state per key; we do not
   // attempt to count presses of the same key on multiple keyboards.
   //
   // A key is down iff the most recent event pertaining to that key was a key
   // down event rather than a key up event. Therefore, a particular key position
   // can be considered released even if it is being depresssed on one or more
   // keyboards.
   std::bitset<KEY_CNT> key_state_;
 
   // Callback for dispatching events.
   EventDispatchCallback callback_;
 
   // Shared modifier state.
   EventModifiersEvdev* modifiers_;
 
   // Shared layout engine.
   KeyboardLayoutEngine* keyboard_layout_engine_;
 
   // Key repeat state.
   bool repeat_enabled_;
   unsigned int repeat_key_;
   unsigned int repeat_sequence_;
-  int repeat_device_id_;
   base::TimeDelta repeat_delay_;
   base::TimeDelta repeat_interval_;
 
   base::WeakPtrFactory<KeyboardEvdev> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyboardEvdev);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_KEYBOARD_EVDEV_H_