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

ui/events/ozone/evdev/event_converter_evdev_impl.cc

 // 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.
 
 #include "ui/events/ozone/evdev/event_converter_evdev_impl.h"
 
 #include <errno.h>
 #include <linux/input.h>
 
 #include "ui/events/event.h"
@@ skipping 13 matching lines @@
 }  // namespace
 
 EventConverterEvdevImpl::EventConverterEvdevImpl(
     int fd,
     base::FilePath path,
     int id,
     InputDeviceType type,
     const EventDeviceInfo& devinfo,
     CursorDelegateEvdev* cursor,
     DeviceEventDispatcherEvdev* dispatcher)
-    : EventConverterEvdev(fd,
-                          path,
-                          id,
-                          type,
-                          devinfo.name(),
-                          devinfo.vendor_id(),
-                          devinfo.product_id()),
+    : EventConverterEvdev(fd, path, id, type),
       has_keyboard_(devinfo.HasKeyboard()),
       has_touchpad_(devinfo.HasTouchpad()),
       has_caps_lock_led_(devinfo.HasLedEvent(LED_CAPSL)),
       x_offset_(0),
       y_offset_(0),
       cursor_(cursor),
       dispatcher_(dispatcher) {
 }
 
 EventConverterEvdevImpl::~EventConverterEvdevImpl() {
@@ skipping 126 matching lines @@
   if (down == key_state_.test(key))
     return;
 
   // Apply key filter (releases for previously pressed keys are excepted).
   if (down && blocked_keys_.test(key))
     return;
 
   // State transition: !(down) -> (down)
   key_state_.set(key, down);
 
-  dispatcher_->DispatchKeyEvent(
-      KeyEventParams(input_device_.id, key, down, timestamp));
+  dispatcher_->DispatchKeyEvent(KeyEventParams(id_, key, down, timestamp));
 }
 
 void EventConverterEvdevImpl::ReleaseKeys() {
   base::TimeDelta timestamp = ui::EventTimeForNow();
   for (int key = 0; key < KEY_CNT; ++key)
     OnKeyChange(key, false /* down */, timestamp);
 }
 
 void EventConverterEvdevImpl::ReleaseMouseButtons() {
   base::TimeDelta timestamp = ui::EventTimeForNow();
@@ skipping 24 matching lines @@
     code = BTN_BACK;
   else if (code == BTN_EXTRA)
     code = BTN_FORWARD;
 
   int button_offset = code - BTN_MOUSE;
   if (mouse_button_state_.test(button_offset) == down)
     return;
 
   mouse_button_state_.set(button_offset, down);
 
-  dispatcher_->DispatchMouseButtonEvent(MouseButtonEventParams(
-      input_device_.id, cursor_->GetLocation(), code, down,
-      /* allow_remap */ true, timestamp));
+  dispatcher_->DispatchMouseButtonEvent(
+      MouseButtonEventParams(id_, cursor_->GetLocation(), code, down,
+                             /* allow_remap */ true, timestamp));
 }
 
 void EventConverterEvdevImpl::FlushEvents(const input_event& input) {
   if (!cursor_ || (x_offset_ == 0 && y_offset_ == 0))
     return;
 
   cursor_->MoveCursor(gfx::Vector2dF(x_offset_, y_offset_));
 
-  dispatcher_->DispatchMouseMoveEvent(
-      MouseMoveEventParams(input_device_.id, cursor_->GetLocation(),
-                           TimeDeltaFromInputEvent(input)));
+  dispatcher_->DispatchMouseMoveEvent(MouseMoveEventParams(
+      id_, cursor_->GetLocation(), TimeDeltaFromInputEvent(input)));
 
   x_offset_ = 0;
   y_offset_ = 0;
 }
 
 }  // namespace ui