[PATCH 2/11] ozone: evdev: Move KeyboardEvdev 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"
@@ skipping 16 matching lines @@
     : public EventConverterEvdev {
  public:
   EventConverterEvdevImpl(int fd,
                           base::FilePath path,
                           int id,
                           InputDeviceType type,
                           const EventDeviceInfo& info,
                           EventModifiersEvdev* modifiers,
                           MouseButtonMapEvdev* button_map,
                           CursorDelegateEvdev* cursor,
-                          KeyboardEvdev* keyboard,
+                          const KeyEventDispatchCallback& key_callback,
                           const EventDispatchCallback& 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;
 
@@ skipping 23 matching lines @@
   // Controller for watching the input fd.
   base::MessagePumpLibevent::FileDescriptorWatcher controller_;
 
   // 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_;
 
-  // Shared keyboard state.
-  KeyboardEvdev* keyboard_;
-
   // Modifier key state (shift, ctrl, etc).
   EventModifiersEvdev* modifiers_;
 
   // Shared mouse button map.
   MouseButtonMapEvdev* button_map_;
 
-  // Callback for dispatching events.
+  // Callbacks for dispatching events.
+  KeyEventDispatchCallback key_callback_;
   EventDispatchCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(EventConverterEvdevImpl);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_EVENT_CONVERTER_EVDEV_IMPL_H_