OLD | NEW |
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 <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | |
11 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard
.h" | |
12 #include "ash/common/wm_shell.h" | |
13 #include "ash/shell.h" | 10 #include "ash/shell.h" |
14 #include "ash/system/tray/system_tray_notifier.h" | 11 #include "ash/system/tray/system_tray_notifier.h" |
15 #include "ash/system/virtual_keyboard/virtual_keyboard_observer.h" | 12 #include "ash/system/virtual_keyboard/virtual_keyboard_observer.h" |
16 #include "ash/test/ash_test_base.h" | 13 #include "ash/test/ash_test_base.h" |
| 14 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
| 15 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h" |
| 16 #include "ash/wm_shell.h" |
17 #include "base/command_line.h" | 17 #include "base/command_line.h" |
18 #include "ui/events/devices/device_data_manager.h" | 18 #include "ui/events/devices/device_data_manager.h" |
19 #include "ui/events/devices/device_hotplug_event_observer.h" | 19 #include "ui/events/devices/device_hotplug_event_observer.h" |
20 #include "ui/events/devices/input_device.h" | 20 #include "ui/events/devices/input_device.h" |
21 #include "ui/events/devices/touchscreen_device.h" | 21 #include "ui/events/devices/touchscreen_device.h" |
22 #include "ui/keyboard/keyboard_export.h" | 22 #include "ui/keyboard/keyboard_export.h" |
23 #include "ui/keyboard/keyboard_switches.h" | 23 #include "ui/keyboard/keyboard_switches.h" |
24 #include "ui/keyboard/keyboard_util.h" | 24 #include "ui/keyboard/keyboard_util.h" |
25 | 25 |
26 namespace ash { | 26 namespace ash { |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
331 UpdateTouchscreenDevices(screens); | 331 UpdateTouchscreenDevices(screens); |
332 std::vector<ui::InputDevice> keyboard_devices; | 332 std::vector<ui::InputDevice> keyboard_devices; |
333 keyboard_devices.push_back(ui::InputDevice( | 333 keyboard_devices.push_back(ui::InputDevice( |
334 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard")); | 334 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard")); |
335 UpdateKeyboardDevices(keyboard_devices); | 335 UpdateKeyboardDevices(keyboard_devices); |
336 ASSERT_TRUE(keyboard::IsKeyboardEnabled()); | 336 ASSERT_TRUE(keyboard::IsKeyboardEnabled()); |
337 } | 337 } |
338 | 338 |
339 } // namespace test | 339 } // namespace test |
340 } // namespace ash | 340 } // namespace ash |
OLD | NEW |