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

Side by Side Diff: ash/virtual_keyboard_controller_unittest.cc

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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 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 <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_observer. h"
11 #include "ash/common/system/tray/system_tray_notifier.h"
12 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 10 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
13 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h" 11 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h"
14 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
15 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "ash/system/tray/system_tray_notifier.h"
15 #include "ash/system/virtual_keyboard/virtual_keyboard_observer.h"
16 #include "ash/test/ash_test_base.h" 16 #include "ash/test/ash_test_base.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
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « ash/virtual_keyboard_controller.cc ('k') | ash/wm/maximize_mode/maximize_mode_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698