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

Side by Side 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 gn build 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/virtual_keyboard_controller.h" 5 #include "ash/virtual_keyboard_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 10 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "ui/events/device_data_manager.h" 13 #include "ui/events/devices/device_data_manager.h"
14 #include "ui/events/input_device.h" 14 #include "ui/events/devices/input_device.h"
15 #include "ui/events/keyboard_device.h" 15 #include "ui/events/devices/keyboard_device.h"
16 #include "ui/events/touchscreen_device.h" 16 #include "ui/events/devices/touchscreen_device.h"
17 #include "ui/gfx/x/x11_types.h" 17 #include "ui/gfx/x/x11_types.h"
18 #include "ui/keyboard/keyboard_switches.h" 18 #include "ui/keyboard/keyboard_switches.h"
19 #include "ui/keyboard/keyboard_util.h" 19 #include "ui/keyboard/keyboard_util.h"
20 20
21 namespace ash { 21 namespace ash {
22 22
23 VirtualKeyboardController::VirtualKeyboardController() 23 VirtualKeyboardController::VirtualKeyboardController()
24 : has_external_keyboard_(false), 24 : has_external_keyboard_(false),
25 has_internal_keyboard_(false), 25 has_internal_keyboard_(false),
26 has_touchscreen_(false) { 26 has_touchscreen_(false) {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 void VirtualKeyboardController::OnTouchscreenDeviceConfigurationChanged() { 100 void VirtualKeyboardController::OnTouchscreenDeviceConfigurationChanged() {
101 UpdateDevices(); 101 UpdateDevices();
102 } 102 }
103 103
104 void VirtualKeyboardController::OnKeyboardDeviceConfigurationChanged() { 104 void VirtualKeyboardController::OnKeyboardDeviceConfigurationChanged() {
105 UpdateDevices(); 105 UpdateDevices();
106 } 106 }
107 107
108 } // namespace ash 108 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698