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

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

Index: chrome/browser/ui/browser_command_controller_unittest.cc

diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc

index 14ffa90822eb68b52b209196b833cc04dda4c3f1..6ff3ad2e01bf094f7842b64e61d3351e6cfcd4b3 100644

--- a/chrome/browser/ui/browser_command_controller_unittest.cc

+++ b/chrome/browser/ui/browser_command_controller_unittest.cc

@@ -100,16 +100,16 @@ TEST_F(BrowserCommandControllerTest, IsReservedCommandOrKey) {

// USE_AURA is #defined.

EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(

IDC_NEW_WINDOW, content::NativeWebKeyboardEvent(ui::KeyEvent(

- ui::ET_KEY_PRESSED, ui::VKEY_N, ui::DomCode::KEY_N,

+ ui::ET_KEY_PRESSED, ui::VKEY_N, ui::DomCode::US_N,

ui::EF_CONTROL_DOWN))));

EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(

IDC_CLOSE_TAB, content::NativeWebKeyboardEvent(ui::KeyEvent(

- ui::ET_KEY_PRESSED, ui::VKEY_W, ui::DomCode::KEY_W,

+ ui::ET_KEY_PRESSED, ui::VKEY_W, ui::DomCode::US_W,

ui::EF_CONTROL_DOWN))));

EXPECT_FALSE(browser()->command_controller()->IsReservedCommandOrKey(

IDC_FIND, content::NativeWebKeyboardEvent(

ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_F,

- ui::DomCode::KEY_F, ui::EF_CONTROL_DOWN))));

+ ui::DomCode::US_F, ui::EF_CONTROL_DOWN))));

#endif // USE_AURA

}

@@ -138,16 +138,16 @@ TEST_F(BrowserCommandControllerTest, IsReservedCommandOrKeyIsApp) {

// USE_AURA is #defined.

EXPECT_FALSE(browser()->command_controller()->IsReservedCommandOrKey(

IDC_NEW_WINDOW, content::NativeWebKeyboardEvent(ui::KeyEvent(

- ui::ET_KEY_PRESSED, ui::VKEY_N, ui::DomCode::KEY_N,

+ ui::ET_KEY_PRESSED, ui::VKEY_N, ui::DomCode::US_N,

ui::EF_CONTROL_DOWN))));

EXPECT_FALSE(browser()->command_controller()->IsReservedCommandOrKey(

IDC_CLOSE_TAB, content::NativeWebKeyboardEvent(ui::KeyEvent(

- ui::ET_KEY_PRESSED, ui::VKEY_W, ui::DomCode::KEY_W,

+ ui::ET_KEY_PRESSED, ui::VKEY_W, ui::DomCode::US_W,

ui::EF_CONTROL_DOWN))));

EXPECT_FALSE(browser()->command_controller()->IsReservedCommandOrKey(

IDC_FIND, content::NativeWebKeyboardEvent(

ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_F,

- ui::DomCode::KEY_F, ui::EF_CONTROL_DOWN))));

+ ui::DomCode::US_F, ui::EF_CONTROL_DOWN))));

#endif // USE_AURA

}