Add new InputDeviceManager interface.

ui/events/devices/device_data_manager.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/devices/device_data_manager.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ui/display/display.h"
@@ skipping 23 matching lines @@
 
 void DeviceDataManager::TouchscreenInfo::Reset() {
   radius_scale = 1.0;
   target_display = display::Display::kInvalidDisplayID;
   device_transform = gfx::Transform();
 }
 
 // static
 DeviceDataManager* DeviceDataManager::instance_ = nullptr;
 
-DeviceDataManager::DeviceDataManager() {}
+DeviceDataManager::DeviceDataManager() {
+  InputDeviceManager::SetInstance(this);
+}
 
-DeviceDataManager::~DeviceDataManager() {}
+DeviceDataManager::~DeviceDataManager() {
+  InputDeviceManager::ClearInstance();
+}
 
 // static
 DeviceDataManager* DeviceDataManager::instance() { return instance_; }
 
 // static
 void DeviceDataManager::set_instance(DeviceDataManager* instance) {
   DCHECK(instance)
       << "Must reset the DeviceDataManager using DeleteInstance().";
   DCHECK(!instance_) << "Can not set multiple instances of DeviceDataManager.";
   instance_ = instance;
@@ skipping 66 matching lines @@
                                               float* y) {
   if (IsTouchDeviceIdValid(touch_device_id)) {
     gfx::Point3F point(*x, *y, 0.0);
     const gfx::Transform& trans = touch_map_[touch_device_id].device_transform;
     trans.TransformPoint(&point);
     *x = point.x();
     *y = point.y();
   }
 }
 
+const std::vector<TouchscreenDevice>& DeviceDataManager::GetTouchscreenDevices()
+    const {
+  return touchscreen_devices_;
+}
+
+const std::vector<InputDevice>& DeviceDataManager::GetKeyboardDevices() const {
+  return keyboard_devices_;
+}
+
+const std::vector<InputDevice>& DeviceDataManager::GetMouseDevices() const {
+  return mouse_devices_;
+}
+
+const std::vector<InputDevice>& DeviceDataManager::GetTouchpadDevices() const {
+  return touchpad_devices_;
+}
+
+bool DeviceDataManager::AreDeviceListsComplete() const {
+  return device_lists_complete_;
+}
+
 int64_t DeviceDataManager::GetTargetDisplayForTouchDevice(
     int touch_device_id) const {
   if (IsTouchDeviceIdValid(touch_device_id))
     return touch_map_[touch_device_id].target_display;
   return display::Display::kInvalidDisplayID;
 }
 
 void DeviceDataManager::OnTouchscreenDevicesUpdated(
     const std::vector<TouchscreenDevice>& devices) {
   if (devices.size() == touchscreen_devices_.size() &&
@@ skipping 77 matching lines @@
 
 void DeviceDataManager::SetTouchscreensEnabled(bool enabled) {
   touch_screens_enabled_ = enabled;
 }
 
 bool DeviceDataManager::AreTouchscreensEnabled() const {
   return touch_screens_enabled_;
 }
 
 }  // namespace ui