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

ui/events/ozone/evdev/event_converter_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_EVENT_CONVERTER_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_EVENT_CONVERTER_EVDEV_H_
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/ozone/evdev/event_dispatch_callback.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 #include "ui/gfx/geometry/size.h"
 
 struct input_event;
 
 namespace ui {
 enum class DomCode;
 
 class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdev
     : public base::MessagePumpLibevent::Watcher {
  public:
   EventConverterEvdev(int fd,
                       const base::FilePath& path,
                       int id,
-                      InputDeviceType type,
-                      const std::string& name,
-                      uint16_t vendor_id,
-                      uint16_t product_id);
+                      InputDeviceType type);
   ~EventConverterEvdev() override;
 
-  int id() const { return input_device_.id; }
+  int id() const { return id_; }
 
   const base::FilePath& path() const { return path_; }
 
-  InputDeviceType type() const { return input_device_.type; }
-
-  const InputDevice& input_device() const { return input_device_; }
+  InputDeviceType type() const { return type_; }
 
   void set_ignore_events(bool ignore_events) { ignore_events_ = ignore_events; }
 
   // Start reading events.
   void Start();
 
   // Stop reading events.
   void Stop();
 
   // Cleanup after we stop reading events (release buttons, etc).
@@ skipping 37 matching lines @@
  protected:
   // base::MessagePumpLibevent::Watcher:
   void OnFileCanWriteWithoutBlocking(int fd) override;
 
   // File descriptor to read.
   int fd_;
 
   // Path to input device.
   base::FilePath path_;
 
-  // Input device information, including id (which uniquely identifies an
-  // event converter) and type.
-  InputDevice input_device_;
+  // Uniquely identifies an event converter.
+  int id_;
+
+  // Type (internal or external).
+  InputDeviceType type_;
 
   // Whether events from the device should be ignored.
   bool ignore_events_;
 
   // Controller for watching the input fd.
   base::MessagePumpLibevent::FileDescriptorWatcher controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EventConverterEvdev);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_EVENT_CONVERTER_EVDEV_H_