ash/virtual_keyboard_controller.cc - Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/

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 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens

Patch Set: fix ozone Created 6 years, 1 month 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 56bf233c96dcc7ad686d6e577ac01772c07ad06b..5c54f46960871a350db5577309109df5a938f7cf 100644

--- a/ash/virtual_keyboard_controller.cc

+++ b/ash/virtual_keyboard_controller.cc

@@ -10,10 +10,10 @@

#include "ash/wm/maximize_mode/maximize_mode_controller.h"

#include "base/command_line.h"

#include "base/strings/string_util.h"

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

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

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

-#include "ui/events/touchscreen_device.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/gfx/x/x11_types.h"

#include "ui/keyboard/keyboard_switches.h"

#include "ui/keyboard/keyboard_util.h"

« no previous file with comments | « ash/virtual_keyboard_controller.h ('k') | ash/virtual_keyboard_controller_unittest.cc » ('j') | no next file with comments »