components/exo/keyboard_unittest.cc - Issue 1560293002: Rename KEY_ constants to avoid conflict with <linux/input.h>

Unified Diff: components/exo/keyboard_unittest.cc

Issue 1560293002: Rename KEY_ constants to avoid conflict with <linux/input.h> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address review comments (Wez) Created 4 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

« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/exo/keyboard_unittest.cc

diff --git a/components/exo/keyboard_unittest.cc b/components/exo/keyboard_unittest.cc

index 6a67d1c0e35833b3bf0d69c69c47537ad4aa0fea..46e37b0e7684d67ef95f99d500af296bb4306f18 100644

--- a/components/exo/keyboard_unittest.cc

+++ b/components/exo/keyboard_unittest.cc

@@ -61,7 +61,7 @@ TEST_F(KeyboardTest, OnKeyboardEnter) {

EXPECT_CALL(delegate, CanAcceptKeyboardEventsForSurface(surface.get()))

.WillOnce(testing::Return(true));

- ui::DomCode expected_pressed_keys[] = {ui::DomCode::KEY_A};

+ ui::DomCode expected_pressed_keys[] = {ui::DomCode::US_A};

EXPECT_CALL(delegate, OnKeyboardModifiers(0));

EXPECT_CALL(delegate,

OnKeyboardEnter(surface.get(),

@@ -131,13 +131,13 @@ TEST_F(KeyboardTest, OnKeyboardKey) {

ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());

// This should only generate one press event for KEY_A.

- EXPECT_CALL(delegate, OnKeyboardKey(testing::_, ui::DomCode::KEY_A, true));

+ EXPECT_CALL(delegate, OnKeyboardKey(testing::_, ui::DomCode::US_A, true));

generator.PressKey(ui::VKEY_A, 0);

generator.ReleaseKey(ui::VKEY_B, 0);

// This should only generate one release event for KEY_A.

- EXPECT_CALL(delegate, OnKeyboardKey(testing::_, ui::DomCode::KEY_A, false));

+ EXPECT_CALL(delegate, OnKeyboardKey(testing::_, ui::DomCode::US_A, false));

generator.ReleaseKey(ui::VKEY_A, 0);

@@ -170,18 +170,18 @@ TEST_F(KeyboardTest, OnKeyboardModifiers) {

ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());

// This should generate a modifier event.

- EXPECT_CALL(delegate, OnKeyboardKey(testing::_, ui::DomCode::KEY_A, true));

+ EXPECT_CALL(delegate, OnKeyboardKey(testing::_, ui::DomCode::US_A, true));

EXPECT_CALL(delegate, OnKeyboardModifiers(ui::EF_SHIFT_DOWN));

generator.PressKey(ui::VKEY_A, ui::EF_SHIFT_DOWN);

// This should generate another modifier event.

- EXPECT_CALL(delegate, OnKeyboardKey(testing::_, ui::DomCode::KEY_B, true));

+ EXPECT_CALL(delegate, OnKeyboardKey(testing::_, ui::DomCode::US_B, true));

EXPECT_CALL(delegate,

OnKeyboardModifiers(ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN));

generator.PressKey(ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);

// This should generate a third modifier event.

- EXPECT_CALL(delegate, OnKeyboardKey(testing::_, ui::DomCode::KEY_B, false));

+ EXPECT_CALL(delegate, OnKeyboardKey(testing::_, ui::DomCode::US_B, false));

EXPECT_CALL(delegate, OnKeyboardModifiers(0));

generator.ReleaseKey(ui::VKEY_B, 0);