ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.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/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc

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

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

« ash/virtual_keyboard_controller_unittest.cc ('K') | « ash/virtual_keyboard_controller_unittest.cc ('k') | chrome/browser/chromeos/events/event_rewriter.cc » ('j') | chrome/browser/chromeos/events/event_rewriter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc

diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc

index a8fedabe23b540c950fa216a1de6c5d59ac94dcc..6c76b40b45332293844b8e396b80c6ba203cd6e1 100644

--- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc

+++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc

@@ -22,7 +22,6 @@

#include "ui/aura/window_event_dispatcher.h"

#include "ui/aura/window_tree_host.h"

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

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

#include "ui/events/devices/x11/device_data_manager_x11.h"

#include "ui/events/devices/x11/device_list_cache_x11.h"

#include "ui/events/event.h"

@@ -98,7 +97,7 @@ ScopedDisableInternalMouseAndKeyboardX11::

}

- for (const ui::KeyboardDevice& device :

+ for (const ui::InputDevice& device :

device_data_manager->keyboard_devices()) {

if (device.type == ui::InputDeviceType::INPUT_DEVICE_INTERNAL) {

keyboard_device_id_ = device.id;