[PATCH 3/11] ozone: evdev: Move MouseButtonMap usage during dispatch to EventFactoryEvdev

ui/events/ozone/evdev/event_converter_evdev_impl.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_IMPL_H_
 #define UI_EVENTS_OZONE_EVDEV_EVENT_CONVERTER_EVDEV_IMPL_H_
 
 #include <set>
 
 #include "base/files/file_path.h"
 #include "base/message_loop/message_pump_libevent.h"
 #include "ui/events/devices/input_device.h"
 #include "ui/events/event.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/event_converter_evdev.h"
 #include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 #include "ui/events/ozone/evdev/keyboard_evdev.h"
 #include "ui/events/ozone/evdev/mouse_button_map_evdev.h"
 
 struct input_event;
 
 namespace ui {
 
 class EVENTS_OZONE_EVDEV_EXPORT EventConverterEvdevImpl
     : public EventConverterEvdev {
  public:
-  EventConverterEvdevImpl(int fd,
-                          base::FilePath path,
-                          int id,
-                          InputDeviceType type,
-                          const EventDeviceInfo& info,
-                          EventModifiersEvdev* modifiers,
-                          MouseButtonMapEvdev* button_map,
-                          CursorDelegateEvdev* cursor,
-                          const KeyEventDispatchCallback& key_callback,
-                          const EventDispatchCallback& callback);
+  EventConverterEvdevImpl(
+      int fd,
+      base::FilePath path,
+      int id,
+      InputDeviceType type,
+      const EventDeviceInfo& info,
+      EventModifiersEvdev* modifiers,
+      CursorDelegateEvdev* cursor,
+      const KeyEventDispatchCallback& key_callback,
+      const MouseMoveEventDispatchCallback& mouse_move_callback,
+      const MouseButtonEventDispatchCallback& mouse_button_callback);
   ~EventConverterEvdevImpl() override;
 
   // EventConverterEvdev:
   void OnFileCanReadWithoutBlocking(int fd) override;
   bool HasKeyboard() const override;
   bool HasTouchpad() const override;
   void SetAllowedKeys(scoped_ptr<std::set<DomCode>> allowed_keys) override;
   void AllowAllKeys() override;
 
   void ProcessEvents(const struct input_event* inputs, int count);
@@ skipping 25 matching lines @@
   // The keys which should be processed. nullptr if all keys should be
   // processed.
   scoped_ptr<std::set<DomCode>> allowed_keys_;
 
   // Shared cursor state.
   CursorDelegateEvdev* cursor_;
 
   // Modifier key state (shift, ctrl, etc).
   EventModifiersEvdev* modifiers_;
 
-  // Shared mouse button map.
-  MouseButtonMapEvdev* button_map_;
-
   // Callbacks for dispatching events.
   KeyEventDispatchCallback key_callback_;
-  EventDispatchCallback callback_;
+  MouseMoveEventDispatchCallback mouse_move_callback_;
+  MouseButtonEventDispatchCallback mouse_button_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(EventConverterEvdevImpl);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_EVENT_CONVERTER_EVDEV_IMPL_H_