chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc - Issue 2028593004: Add new InputDeviceManager interface.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.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

« no previous file with comments | « chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h ('k') | ui/base/material_design/material_design_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc

diff --git a/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc

index 8d7c3d69324d47f383c720d85fcc5fd6dff2054d..84867f5e947ed4f2b9a64be131152be8f5ba8cbb 100644

--- a/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc

+++ b/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc

@@ -12,13 +12,13 @@

#include "chrome/browser/profiles/profile.h"

#include "chromeos/chromeos_switches.h"

#include "content/public/browser/web_ui.h"

-#include "ui/events/devices/device_data_manager.h"

+#include "ui/events/devices/input_device_manager.h"

namespace {

bool HasExternalKeyboard() {

for (const ui::InputDevice& keyboard :

- ui::DeviceDataManager::GetInstance()->keyboard_devices()) {

+ ui::InputDeviceManager::GetInstance()->GetKeyboardDevices()) {

if (keyboard.type == ui::InputDeviceType::INPUT_DEVICE_EXTERNAL)

return true;

}

@@ -49,7 +49,7 @@ void KeyboardHandler::RegisterMessages() {

}

void KeyboardHandler::OnJavascriptAllowed() {

- observer_.Add(ui::DeviceDataManager::GetInstance());

+ observer_.Add(ui::InputDeviceManager::GetInstance());

}

void KeyboardHandler::OnJavascriptDisallowed() {