ash/touch/touchscreen_util_unittest.cc - Issue 1073573002: Ozone support for device special cases in keyboard event rewriting.

Unified Diff: ash/touch/touchscreen_util_unittest.cc

Issue 1073573002: Ozone support for device special cases in keyboard event rewriting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: white space Created 5 years, 8 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

« no previous file with comments | « ash/touch/touch_transformer_controller_unittest.cc ('k') | ash/virtual_keyboard_controller_unittest.cc » ('j') | chrome/browser/chromeos/events/event_rewriter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/touch/touchscreen_util_unittest.cc

diff --git a/ash/touch/touchscreen_util_unittest.cc b/ash/touch/touchscreen_util_unittest.cc

index 4993093b2bfecf4c349f8ed0b7e968f88071125f..a80c357cdb61a3bd3af3eb4a0d8493c577377468 100644

--- a/ash/touch/touchscreen_util_unittest.cc

+++ b/ash/touch/touchscreen_util_unittest.cc

@@ -76,10 +76,12 @@ TEST_F(TouchscreenUtilTest, NoTouchscreens) {

TEST_F(TouchscreenUtilTest, OneToOneMapping) {

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

- devices.push_back(ui::TouchscreenDevice(

- 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(800, 600), 0));

- devices.push_back(ui::TouchscreenDevice(

- 2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(1024, 768), 0));

+ devices.push_back(

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

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

+ devices.push_back(

+ ui::TouchscreenDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "",

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

AssociateTouchscreens(&displays_, devices);

@@ -91,8 +93,9 @@ TEST_F(TouchscreenUtilTest, OneToOneMapping) {

TEST_F(TouchscreenUtilTest, MapToCorrectDisplaySize) {

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

- devices.push_back(ui::TouchscreenDevice(

- 2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(1024, 768), 0));

+ devices.push_back(

+ ui::TouchscreenDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "",

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

AssociateTouchscreens(&displays_, devices);

@@ -104,10 +107,12 @@ TEST_F(TouchscreenUtilTest, MapToCorrectDisplaySize) {

TEST_F(TouchscreenUtilTest, MapWhenSizeDiffersByOne) {

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

- devices.push_back(ui::TouchscreenDevice(

- 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(801, 600), 0));

- devices.push_back(ui::TouchscreenDevice(

- 2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(1023, 768), 0));

+ devices.push_back(

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

+ gfx::Size(801, 600), 0));

+ devices.push_back(

+ ui::TouchscreenDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "",

+ gfx::Size(1023, 768), 0));

AssociateTouchscreens(&displays_, devices);

@@ -119,10 +124,12 @@ TEST_F(TouchscreenUtilTest, MapWhenSizeDiffersByOne) {

TEST_F(TouchscreenUtilTest, MapWhenSizesDoNotMatch) {

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

- devices.push_back(ui::TouchscreenDevice(

- 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(1022, 768), 0));

- devices.push_back(ui::TouchscreenDevice(

- 2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(802, 600), 0));

+ devices.push_back(

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

+ gfx::Size(1022, 768), 0));

+ devices.push_back(

+ ui::TouchscreenDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "",

+ gfx::Size(802, 600), 0));

AssociateTouchscreens(&displays_, devices);

@@ -134,10 +141,12 @@ TEST_F(TouchscreenUtilTest, MapWhenSizesDoNotMatch) {

TEST_F(TouchscreenUtilTest, MapInternalTouchscreen) {

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

- devices.push_back(ui::TouchscreenDevice(

- 1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(1920, 1080), 0));

- devices.push_back(ui::TouchscreenDevice(

- 2, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(9999, 888), 0));

+ devices.push_back(

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

+ gfx::Size(1920, 1080), 0));

+ devices.push_back(

+ ui::TouchscreenDevice(2, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "",

+ gfx::Size(9999, 888), 0));

AssociateTouchscreens(&displays_, devices);