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

Unified Diff: chrome/browser/chromeos/events/event_rewriter.cc

Issue 2028593004: Add new InputDeviceManager interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_keyboard
Patch Set: Fix windows compile error. 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: chrome/browser/chromeos/events/event_rewriter.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc
index df91af3a4d3f0e0aa5a15fd7346ef628952425fd..f129a04bfc71854e573951752311f52f9795fb75 100644
--- a/chrome/browser/chromeos/events/event_rewriter.cc
+++ b/chrome/browser/chromeos/events/event_rewriter.cc
@@ -27,7 +27,7 @@
#include "components/user_manager/user_manager.h"
#include "ui/base/ime/chromeos/ime_keyboard.h"
#include "ui/base/ime/chromeos/input_method_manager.h"
-#include "ui/events/devices/device_data_manager.h"
+#include "ui/events/devices/input_device_manager.h"
#include "ui/events/event.h"
#include "ui/events/event_utils.h"
#include "ui/events/keycodes/dom/dom_code.h"
@@ -1140,10 +1140,10 @@ EventRewriter::DeviceType EventRewriter::KeyboardDeviceAddedInternal(
}
EventRewriter::DeviceType EventRewriter::KeyboardDeviceAdded(int device_id) {
- if (!ui::DeviceDataManager::HasInstance())
+ if (!ui::InputDeviceManager::HasInstance())
return kDeviceUnknown;
const std::vector<ui::InputDevice>& keyboard_devices =
- ui::DeviceDataManager::GetInstance()->keyboard_devices();
+ ui::InputDeviceManager::GetInstance()->GetKeyboardDevices();
for (const auto& keyboard : keyboard_devices) {
if (keyboard.id == device_id) {
return KeyboardDeviceAddedInternal(

Powered by Google App Engine
This is Rietveld 408576698