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

Side by Side Diff: ash/virtual_keyboard_controller_unittest.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 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 "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h" 8 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"
9 #include "ash/test/ash_test_base.h" 9 #include "ash/test/ash_test_base.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 "ui/events/device_data_manager.h" 12 #include "ui/events/devices/device_data_manager.h"
13 #include "ui/events/device_hotplug_event_observer.h" 13 #include "ui/events/devices/device_hotplug_event_observer.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/keyboard/keyboard_export.h" 17 #include "ui/keyboard/keyboard_export.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 namespace test { 22 namespace test {
23 23
24 class VirtualKeyboardControllerTest : public AshTestBase { 24 class VirtualKeyboardControllerTest : public AshTestBase {
25 public: 25 public:
26 VirtualKeyboardControllerTest() {} 26 VirtualKeyboardControllerTest() {}
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 // suppressed. 180 // suppressed.
181 ResetObserver(); 181 ResetObserver();
182 UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>()); 182 UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>());
183 ASSERT_TRUE(keyboard::IsKeyboardEnabled()); 183 ASSERT_TRUE(keyboard::IsKeyboardEnabled());
184 ASSERT_TRUE(notified()); 184 ASSERT_TRUE(notified());
185 ASSERT_FALSE(IsVirtualKeyboardSuppressed()); 185 ASSERT_FALSE(IsVirtualKeyboardSuppressed());
186 } 186 }
187 187
188 } // namespace test 188 } // namespace test
189 } // namespace ash 189 } // namespace ash
OLDNEW
« no previous file with comments | « ash/virtual_keyboard_controller.cc ('k') | ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698