chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc - Issue 1560293002: Rename KEY_ constants to avoid conflict with <linux/input.h>

Unified Diff: chrome/browser/chromeos/input_method/input_method_engine_browsertests.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/chromeos/events/event_rewriter_unittest.cc ('k') | chrome/browser/ui/browser_command_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

diff --git a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

index 3ac0eea063a0a9ec901bfab60a8956634395d793..af45182e75ee6a8b15cb3c6d72d3551274d6509f 100644

--- a/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

+++ b/chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

@@ -271,7 +271,7 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,

ExtensionTestMessageListener keyevent_listener(expected_value, false);

ui::KeyEvent key_event(

- ui::ET_KEY_PRESSED, ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_NONE);

+ ui::ET_KEY_PRESSED, ui::VKEY_A, ui::DomCode::US_A, ui::EF_NONE);

ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback =

base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback));

engine_handler->ProcessKeyEvent(key_event, keyevent_callback);

@@ -288,7 +288,7 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,

ui::KeyEvent key_event(ui::ET_KEY_PRESSED,

ui::VKEY_A,

- ui::DomCode::KEY_A,

+ ui::DomCode::US_A,

ui::EF_CONTROL_DOWN);

ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback =

base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback));

@@ -306,7 +306,7 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,

ui::KeyEvent key_event(ui::ET_KEY_PRESSED,

ui::VKEY_A,

- ui::DomCode::KEY_A,

+ ui::DomCode::US_A,

ui::EF_ALT_DOWN);

ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback =

base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback));

@@ -324,7 +324,7 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,

ui::KeyEvent key_event(ui::ET_KEY_PRESSED,

ui::VKEY_A,

- ui::DomCode::KEY_A,

+ ui::DomCode::US_A,

ui::EF_SHIFT_DOWN);

ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback =

base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback));

@@ -342,7 +342,7 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,

ui::KeyEvent key_event(ui::ET_KEY_PRESSED,

ui::VKEY_A,

- ui::DomCode::KEY_A,

+ ui::DomCode::US_A,

ui::EF_CAPS_LOCK_DOWN);

ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback =

base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback));

@@ -360,7 +360,7 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,

ui::KeyEvent key_event(ui::ET_KEY_PRESSED,

ui::VKEY_A,

- ui::DomCode::KEY_A,

+ ui::DomCode::US_A,

ui::EF_ALT_DOWN | ui::EF_CONTROL_DOWN);

ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback =

base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback));

@@ -378,7 +378,7 @@ IN_PROC_BROWSER_TEST_P(InputMethodEngineBrowserTest,

ui::KeyEvent key_event(ui::ET_KEY_PRESSED,

ui::VKEY_A,

- ui::DomCode::KEY_A,

+ ui::DomCode::US_A,

ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN);

ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback =

base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback));