Add new InputDeviceManager interface.

ash/virtual_keyboard_controller.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 "ash/virtual_keyboard_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
-#include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/input_device.h"
+#include "ui/events/devices/input_device_manager.h"
 #include "ui/events/devices/touchscreen_device.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace ash {
 namespace {
 
 // Checks whether smart deployment is enabled.
 bool IsSmartVirtualKeyboardEnabled() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           keyboard::switches::kEnableVirtualKeyboard)) {
     return false;
   }
   return keyboard::IsSmartDeployEnabled();
 }
 
 }  // namespace
 
 VirtualKeyboardController::VirtualKeyboardController()
     : has_external_keyboard_(false),
       has_internal_keyboard_(false),
       has_touchscreen_(false),
       ignore_external_keyboard_(false) {
   Shell::GetInstance()->AddShellObserver(this);
-  ui::DeviceDataManager::GetInstance()->AddObserver(this);
+  ui::InputDeviceManager::GetInstance()->AddObserver(this);
   UpdateDevices();
 }
 
 VirtualKeyboardController::~VirtualKeyboardController() {
   Shell::GetInstance()->RemoveShellObserver(this);
-  ui::DeviceDataManager::GetInstance()->RemoveObserver(this);
+  ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
 }
 
 void VirtualKeyboardController::OnMaximizeModeStarted() {
   if (!IsSmartVirtualKeyboardEnabled()) {
     SetKeyboardEnabled(true);
   } else {
     UpdateKeyboardEnabled();
   }
 }
 
@@ skipping 12 matching lines @@
 void VirtualKeyboardController::OnKeyboardDeviceConfigurationChanged() {
   UpdateDevices();
 }
 
 void VirtualKeyboardController::ToggleIgnoreExternalKeyboard() {
   ignore_external_keyboard_ = !ignore_external_keyboard_;
   UpdateKeyboardEnabled();
 }
 
 void VirtualKeyboardController::UpdateDevices() {
-  ui::DeviceDataManager* device_data_manager =
-      ui::DeviceDataManager::GetInstance();
+  ui::InputDeviceManager* device_data_manager =
+      ui::InputDeviceManager::GetInstance();
 
   // Checks for touchscreens.
-  has_touchscreen_ = device_data_manager->touchscreen_devices().size() > 0;
+  has_touchscreen_ = device_data_manager->GetTouchscreenDevices().size() > 0;
 
   // Checks for keyboards.
   has_external_keyboard_ = false;
   has_internal_keyboard_ = false;
   for (const ui::InputDevice& device :
-       device_data_manager->keyboard_devices()) {
+       device_data_manager->GetKeyboardDevices()) {
     if (has_internal_keyboard_ && has_external_keyboard_)
       break;
     ui::InputDeviceType type = device.type;
     if (type == ui::InputDeviceType::INPUT_DEVICE_INTERNAL)
       has_internal_keyboard_ = true;
     if (type == ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)
       has_external_keyboard_ = true;
   }
   // Update keyboard state.
   UpdateKeyboardEnabled();
@@ skipping 27 matching lines @@
   if (is_enabled == was_enabled)
     return;
   if (is_enabled) {
     Shell::GetInstance()->CreateKeyboard();
   } else {
     Shell::GetInstance()->DeactivateKeyboard();
   }
 }
 
 }  // namespace ash