ash/virtual_keyboard_controller.cc - Issue 2019413002: Remove KeyboardDevice class.

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: ash/virtual_keyboard_controller.cc

Issue 2019413002: Remove KeyboardDevice class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixes for comments. 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:

Index: ash/virtual_keyboard_controller.cc

diff --git a/ash/virtual_keyboard_controller.cc b/ash/virtual_keyboard_controller.cc

index 31d2a6426692eb6eb61faf0d605a1f6eb4b84e7d..94fcd39373a85be78ddd376824991395769f1071 100644

--- a/ash/virtual_keyboard_controller.cc

+++ b/ash/virtual_keyboard_controller.cc

@@ -13,7 +13,6 @@

#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/keyboard_device.h"

#include "ui/events/devices/touchscreen_device.h"

#include "ui/keyboard/keyboard_switches.h"

#include "ui/keyboard/keyboard_util.h"

@@ -86,7 +85,7 @@ void VirtualKeyboardController::UpdateDevices() {

// Checks for keyboards.

has_external_keyboard_ = false;

has_internal_keyboard_ = false;

- for (const ui::KeyboardDevice& device :

+ for (const ui::InputDevice& device :

device_data_manager->keyboard_devices()) {

if (has_internal_keyboard_ && has_external_keyboard_)

break;