ash/virtual_keyboard_controller_unittest.cc - Issue 845413002: touch: Change how touch-screen capability is processed.

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

Unified Diff: ash/virtual_keyboard_controller_unittest.cc

Issue 845413002: touch: Change how touch-screen capability is processed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 5 years, 11 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 side-by-side diff with in-line comments

Download patch

Index: ash/virtual_keyboard_controller_unittest.cc

diff --git a/ash/virtual_keyboard_controller_unittest.cc b/ash/virtual_keyboard_controller_unittest.cc

index ef271087f8e1b0330c0d408a439d97f46d4c8fdf..4ca7e1f0dd8567a45a006f3528600fafc2cd9e85 100644

--- a/ash/virtual_keyboard_controller_unittest.cc

+++ b/ash/virtual_keyboard_controller_unittest.cc

@@ -116,10 +116,8 @@ class VirtualKeyboardControllerAutoTest : public VirtualKeyboardControllerTest,

TEST_F(VirtualKeyboardControllerAutoTest, DisabledIfInternalKeyboardPresent) {

std::vector<ui::TouchscreenDevice> screens;

screens.push_back(

- ui::TouchscreenDevice(1,

- ui::InputDeviceType::INPUT_DEVICE_INTERNAL,

- "Touchscreen",

- gfx::Size(1024, 768)));

+ ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL,

+ "Touchscreen", gfx::Size(1024, 768), 0));

UpdateTouchscreenDevices(screens);

std::vector<ui::KeyboardDevice> keyboards;

keyboards.push_back(ui::KeyboardDevice(

@@ -138,10 +136,8 @@ TEST_F(VirtualKeyboardControllerAutoTest, DisabledIfNoTouchScreen) {

std::vector<ui::TouchscreenDevice> devices;

// Add a touchscreen. Keyboard should deploy.

devices.push_back(

- ui::TouchscreenDevice(1,

- ui::InputDeviceType::INPUT_DEVICE_EXTERNAL,

- "Touchscreen",

- gfx::Size(800, 600)));

+ ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL,

+ "Touchscreen", gfx::Size(800, 600), 0));

UpdateTouchscreenDevices(devices);

EXPECT_TRUE(keyboard::IsKeyboardEnabled());

// Remove touchscreen. Keyboard should hide.

@@ -152,10 +148,8 @@ TEST_F(VirtualKeyboardControllerAutoTest, DisabledIfNoTouchScreen) {

TEST_F(VirtualKeyboardControllerAutoTest, SuppressedIfExternalKeyboardPresent) {

std::vector<ui::TouchscreenDevice> screens;

screens.push_back(

- ui::TouchscreenDevice(1,

- ui::InputDeviceType::INPUT_DEVICE_INTERNAL,

- "Touchscreen",

- gfx::Size(1024, 768)));

+ ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL,

+ "Touchscreen", gfx::Size(1024, 768), 0));

UpdateTouchscreenDevices(screens);

std::vector<ui::KeyboardDevice> keyboards;

keyboards.push_back(ui::KeyboardDevice(

« no previous file with comments | « ash/touch/touchscreen_util_unittest.cc ('k') | ui/base/touch/touch_device_aurax11.cc » ('j') | no next file with comments »