Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(520)

Unified Diff: ash/virtual_keyboard_controller.cc

Issue 2028593004: Add new InputDeviceManager interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_keyboard
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/virtual_keyboard_controller.cc
diff --git a/ash/virtual_keyboard_controller.cc b/ash/virtual_keyboard_controller.cc
index 94fcd39373a85be78ddd376824991395769f1071..9c79113701ee9f89a6d5deef09e4de34aaf5bbe0 100644
--- a/ash/virtual_keyboard_controller.cc
+++ b/ash/virtual_keyboard_controller.cc
@@ -11,8 +11,8 @@
#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"
@@ -37,13 +37,13 @@ VirtualKeyboardController::VirtualKeyboardController()
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() {
@@ -76,8 +76,8 @@ void VirtualKeyboardController::ToggleIgnoreExternalKeyboard() {
}
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;

Powered by Google App Engine
This is Rietveld 408576698