[PATCH 11/11] ozone: evdev: Add dedicated events thread

ui/events/ozone/evdev/event_factory_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_FACTORY_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_EVENT_FACTORY_EVDEV_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
 #include "ui/events/ozone/device/device_event_observer.h"
 #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h"
 #include "ui/events/ozone/evdev/event_modifiers_evdev.h"
+#include "ui/events/ozone/evdev/event_thread_evdev.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
 #include "ui/events/ozone/evdev/input_controller_evdev.h"
 #include "ui/events/ozone/evdev/keyboard_evdev.h"
 #include "ui/events/ozone/evdev/mouse_button_map_evdev.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/ozone/public/system_input_injector.h"
 
 namespace gfx {
 class PointF;
@@ skipping 64 matching lines @@
 
  private:
   // Post a task to dispatch an event.
   virtual void PostUiEvent(scoped_ptr<Event> event);
 
   // Dispatch event via PlatformEventSource.
   void DispatchUiEventTask(scoped_ptr<Event> event);
 
   int NextDeviceId();
 
+  // Device thread initialization.
+  void StartThread();
+  void OnThreadStarted(
+      scoped_ptr<InputDeviceFactoryProxyEvdev> input_device_factory);
+
   // Used to uniquely identify input devices.
   int last_device_id_;
 
   // Interface for scanning & monitoring input devices.
   DeviceManager* device_manager_;  // Not owned.
 
   // Factory for per-device objects.
-  scoped_ptr<InputDeviceFactoryEvdev> input_device_factory_;
   scoped_ptr<InputDeviceFactoryProxyEvdev> input_device_factory_proxy_;
 
   // Dispatch callback for events.
   EventDispatchCallback dispatch_callback_;
 
   // Modifier key state (shift, ctrl, etc).
   EventModifiersEvdev modifiers_;
 
   // Mouse button map.
   MouseButtonMapEvdev button_map_;
 
   // Keyboard state.
   KeyboardEvdev keyboard_;
 
   // Cursor movement.
   CursorDelegateEvdev* cursor_;
 
   // Object for controlling input devices.
   InputControllerEvdev input_controller_;
 
-  // Whether we've set up the device factory & done initial scan.
+  // Whether we've set up the device factory.
   bool initialized_;
 
+  // Thread for device I/O.
+  EventThreadEvdev thread_;
+
   // Support weak pointers for attach & detach callbacks.
   base::WeakPtrFactory<EventFactoryEvdev> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EventFactoryEvdev);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_EVENT_FACTORY_EVDEV_H_