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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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 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

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 "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/test/ash_test_base.h"	8 #include "ash/test/ash_test_base.h"

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

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "ui/events/device_data_manager.h"	11 #include "ui/events/devices/device_data_manager.h"

12 #include "ui/events/device_hotplug_event_observer.h"	12 #include "ui/events/devices/device_hotplug_event_observer.h"

13 #include "ui/events/input_device.h"	13 #include "ui/events/devices/input_device.h"

14 #include "ui/events/keyboard_device.h"	14 #include "ui/events/devices/keyboard_device.h"

15 #include "ui/events/touchscreen_device.h"	15 #include "ui/events/devices/touchscreen_device.h"

16 #include "ui/keyboard/keyboard_export.h"	16 #include "ui/keyboard/keyboard_export.h"

17 #include "ui/keyboard/keyboard_switches.h"	17 #include "ui/keyboard/keyboard_switches.h"

18 #include "ui/keyboard/keyboard_util.h"	18 #include "ui/keyboard/keyboard_util.h"

19	19

20 namespace ash {	20 namespace ash {

21 namespace test {	21 namespace test {

22	22

23 class VirtualKeyboardControllerTest : public AshTestBase {	23 class VirtualKeyboardControllerTest : public AshTestBase {

24 public:	24 public:

25 VirtualKeyboardControllerTest() {}	25 VirtualKeyboardControllerTest() {}

(...skipping 78 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 gfx::Size(800, 600)));	104 gfx::Size(800, 600)));

105 UpdateTouchscreenDevices(devices);	105 UpdateTouchscreenDevices(devices);

106 EXPECT_TRUE(keyboard::IsKeyboardEnabled());	106 EXPECT_TRUE(keyboard::IsKeyboardEnabled());

107 // Remove touchscreen. Keyboard should hide.	107 // Remove touchscreen. Keyboard should hide.

108 UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());	108 UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());

109 EXPECT_FALSE(keyboard::IsKeyboardEnabled());	109 EXPECT_FALSE(keyboard::IsKeyboardEnabled());

110 }	110 }

111	111

112 } // namespace test	112 } // namespace test

113 } // namespace ash	113 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/virtual_keyboard_controller.cc ('k') | ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc » ('j') | ui/events/devices/BUILD.gn » ('J')