Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/events/event_rewriter_unittest.cc

Issue 286103004: Blocked volume up/down events that originated from remapped function keys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated AllowsVolumeControl comment and ifdefed events_test_utils_x11.h include. Created 6 years, 7 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
« ash/wm/maximize_mode/maximize_mode_event_blocker.cc ('K') | « chrome/browser/chromeos/events/event_rewriter.cc ('k') | ui/events/event_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/events/event_rewriter_unittest.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index ed0e7e10bf5b911971932364fc994c4804303874..843c9dd9e22b9f4ab7a878bb7f946708264ad279 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -1186,68 +1186,82 @@ TEST_F(EventRewriterTest, TestRewriteFunctionKeys) {
unsigned int output_mods;
} tests[] = {
// F1 -> Back
- {ui::VKEY_F1, ui::EF_NONE, ui::VKEY_BROWSER_BACK, ui::EF_NONE},
+ {ui::VKEY_F1, ui::EF_NONE, ui::VKEY_BROWSER_BACK, ui::EF_FUNCTION_KEY},
{ui::VKEY_F1, ui::EF_CONTROL_DOWN, ui::VKEY_BROWSER_BACK,
- ui::EF_CONTROL_DOWN},
- {ui::VKEY_F1, ui::EF_ALT_DOWN, ui::VKEY_BROWSER_BACK, ui::EF_ALT_DOWN},
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F1, ui::EF_ALT_DOWN, ui::VKEY_BROWSER_BACK,
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// F2 -> Forward
- {ui::VKEY_F2, ui::EF_NONE, ui::VKEY_BROWSER_FORWARD, ui::EF_NONE},
+ {ui::VKEY_F2, ui::EF_NONE, ui::VKEY_BROWSER_FORWARD,
+ ui::EF_FUNCTION_KEY},
{ui::VKEY_F2, ui::EF_CONTROL_DOWN, ui::VKEY_BROWSER_FORWARD,
- ui::EF_CONTROL_DOWN},
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
{ui::VKEY_F2, ui::EF_ALT_DOWN, ui::VKEY_BROWSER_FORWARD,
- ui::EF_ALT_DOWN},
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// F3 -> Refresh
- {ui::VKEY_F3, ui::EF_NONE, ui::VKEY_BROWSER_REFRESH, ui::EF_NONE},
+ {ui::VKEY_F3, ui::EF_NONE, ui::VKEY_BROWSER_REFRESH,
+ ui::EF_FUNCTION_KEY},
{ui::VKEY_F3, ui::EF_CONTROL_DOWN, ui::VKEY_BROWSER_REFRESH,
- ui::EF_CONTROL_DOWN},
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
{ui::VKEY_F3, ui::EF_ALT_DOWN, ui::VKEY_BROWSER_REFRESH,
- ui::EF_ALT_DOWN},
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// F4 -> Launch App 2
- {ui::VKEY_F4, ui::EF_NONE, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE},
+ {ui::VKEY_F4, ui::EF_NONE, ui::VKEY_MEDIA_LAUNCH_APP2,
+ ui::EF_FUNCTION_KEY},
{ui::VKEY_F4, ui::EF_CONTROL_DOWN, ui::VKEY_MEDIA_LAUNCH_APP2,
- ui::EF_CONTROL_DOWN},
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
{ui::VKEY_F4, ui::EF_ALT_DOWN, ui::VKEY_MEDIA_LAUNCH_APP2,
- ui::EF_ALT_DOWN},
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// F5 -> Launch App 1
- {ui::VKEY_F5, ui::EF_NONE, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE},
+ {ui::VKEY_F5, ui::EF_NONE, ui::VKEY_MEDIA_LAUNCH_APP1,
+ ui::EF_FUNCTION_KEY},
{ui::VKEY_F5, ui::EF_CONTROL_DOWN, ui::VKEY_MEDIA_LAUNCH_APP1,
- ui::EF_CONTROL_DOWN},
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
{ui::VKEY_F5, ui::EF_ALT_DOWN, ui::VKEY_MEDIA_LAUNCH_APP1,
- ui::EF_ALT_DOWN},
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// F6 -> Brightness down
- {ui::VKEY_F6, ui::EF_NONE, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE},
+ {ui::VKEY_F6, ui::EF_NONE, ui::VKEY_BRIGHTNESS_DOWN,
+ ui::EF_FUNCTION_KEY},
{ui::VKEY_F6, ui::EF_CONTROL_DOWN, ui::VKEY_BRIGHTNESS_DOWN,
- ui::EF_CONTROL_DOWN},
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
{ui::VKEY_F6, ui::EF_ALT_DOWN, ui::VKEY_BRIGHTNESS_DOWN,
- ui::EF_ALT_DOWN},
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// F7 -> Brightness up
- {ui::VKEY_F7, ui::EF_NONE, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE},
+ {ui::VKEY_F7, ui::EF_NONE, ui::VKEY_BRIGHTNESS_UP, ui::EF_FUNCTION_KEY},
{ui::VKEY_F7, ui::EF_CONTROL_DOWN, ui::VKEY_BRIGHTNESS_UP,
- ui::EF_CONTROL_DOWN},
- {ui::VKEY_F7, ui::EF_ALT_DOWN, ui::VKEY_BRIGHTNESS_UP, ui::EF_ALT_DOWN},
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F7, ui::EF_ALT_DOWN, ui::VKEY_BRIGHTNESS_UP,
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// F8 -> Volume Mute
- {ui::VKEY_F8, ui::EF_NONE, ui::VKEY_VOLUME_MUTE, ui::EF_NONE},
+ {ui::VKEY_F8, ui::EF_NONE, ui::VKEY_VOLUME_MUTE, ui::EF_FUNCTION_KEY},
{ui::VKEY_F8, ui::EF_CONTROL_DOWN, ui::VKEY_VOLUME_MUTE,
- ui::EF_CONTROL_DOWN},
- {ui::VKEY_F8, ui::EF_ALT_DOWN, ui::VKEY_VOLUME_MUTE, ui::EF_ALT_DOWN},
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F8, ui::EF_ALT_DOWN, ui::VKEY_VOLUME_MUTE,
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// F9 -> Volume Down
- {ui::VKEY_F9, ui::EF_NONE, ui::VKEY_VOLUME_DOWN, ui::EF_NONE},
+ {ui::VKEY_F9, ui::EF_NONE, ui::VKEY_VOLUME_DOWN, ui::EF_FUNCTION_KEY},
{ui::VKEY_F9, ui::EF_CONTROL_DOWN, ui::VKEY_VOLUME_DOWN,
- ui::EF_CONTROL_DOWN},
- {ui::VKEY_F9, ui::EF_ALT_DOWN, ui::VKEY_VOLUME_DOWN, ui::EF_ALT_DOWN},
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F9, ui::EF_ALT_DOWN, ui::VKEY_VOLUME_DOWN,
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// F10 -> Volume Up
- {ui::VKEY_F10, ui::EF_NONE, ui::VKEY_VOLUME_UP, ui::EF_NONE},
+ {ui::VKEY_F10, ui::EF_NONE, ui::VKEY_VOLUME_UP, ui::EF_FUNCTION_KEY},
{ui::VKEY_F10, ui::EF_CONTROL_DOWN, ui::VKEY_VOLUME_UP,
- ui::EF_CONTROL_DOWN},
- {ui::VKEY_F10, ui::EF_ALT_DOWN, ui::VKEY_VOLUME_UP, ui::EF_ALT_DOWN},
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F10, ui::EF_ALT_DOWN, ui::VKEY_VOLUME_UP,
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// F11 -> F11
- {ui::VKEY_F11, ui::EF_NONE, ui::VKEY_F11, ui::EF_NONE},
- {ui::VKEY_F11, ui::EF_CONTROL_DOWN, ui::VKEY_F11, ui::EF_CONTROL_DOWN},
- {ui::VKEY_F11, ui::EF_ALT_DOWN, ui::VKEY_F11, ui::EF_ALT_DOWN},
+ {ui::VKEY_F11, ui::EF_NONE, ui::VKEY_F11, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F11, ui::EF_CONTROL_DOWN, ui::VKEY_F11,
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F11, ui::EF_ALT_DOWN, ui::VKEY_F11,
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// F12 -> F12
- {ui::VKEY_F12, ui::EF_NONE, ui::VKEY_F12, ui::EF_NONE},
- {ui::VKEY_F12, ui::EF_CONTROL_DOWN, ui::VKEY_F12, ui::EF_CONTROL_DOWN},
- {ui::VKEY_F12, ui::EF_ALT_DOWN, ui::VKEY_F12, ui::EF_ALT_DOWN},
+ {ui::VKEY_F12, ui::EF_NONE, ui::VKEY_F12, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F12, ui::EF_CONTROL_DOWN, ui::VKEY_F12,
+ ui::EF_CONTROL_DOWN | ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F12, ui::EF_ALT_DOWN, ui::VKEY_F12,
+ ui::EF_ALT_DOWN | ui::EF_FUNCTION_KEY},
// The number row should not be rewritten without Search key.
{ui::VKEY_1, ui::EF_NONE, ui::VKEY_1, ui::EF_NONE},
@@ -1279,18 +1293,18 @@ TEST_F(EventRewriterTest, TestRewriteFunctionKeys) {
{ui::VKEY_OEM_PLUS, ui::EF_COMMAND_DOWN, ui::VKEY_F12, ui::EF_NONE},
// The function keys should not be rewritten with Search key pressed.
- {ui::VKEY_F1, ui::EF_COMMAND_DOWN, ui::VKEY_F1, ui::EF_NONE},
- {ui::VKEY_F2, ui::EF_COMMAND_DOWN, ui::VKEY_F2, ui::EF_NONE},
- {ui::VKEY_F3, ui::EF_COMMAND_DOWN, ui::VKEY_F3, ui::EF_NONE},
- {ui::VKEY_F4, ui::EF_COMMAND_DOWN, ui::VKEY_F4, ui::EF_NONE},
- {ui::VKEY_F5, ui::EF_COMMAND_DOWN, ui::VKEY_F5, ui::EF_NONE},
- {ui::VKEY_F6, ui::EF_COMMAND_DOWN, ui::VKEY_F6, ui::EF_NONE},
- {ui::VKEY_F7, ui::EF_COMMAND_DOWN, ui::VKEY_F7, ui::EF_NONE},
- {ui::VKEY_F8, ui::EF_COMMAND_DOWN, ui::VKEY_F8, ui::EF_NONE},
- {ui::VKEY_F9, ui::EF_COMMAND_DOWN, ui::VKEY_F9, ui::EF_NONE},
- {ui::VKEY_F10, ui::EF_COMMAND_DOWN, ui::VKEY_F10, ui::EF_NONE},
- {ui::VKEY_F11, ui::EF_COMMAND_DOWN, ui::VKEY_F11, ui::EF_NONE},
- {ui::VKEY_F12, ui::EF_COMMAND_DOWN, ui::VKEY_F12, ui::EF_NONE},
+ {ui::VKEY_F1, ui::EF_COMMAND_DOWN, ui::VKEY_F1, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F2, ui::EF_COMMAND_DOWN, ui::VKEY_F2, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F3, ui::EF_COMMAND_DOWN, ui::VKEY_F3, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F4, ui::EF_COMMAND_DOWN, ui::VKEY_F4, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F5, ui::EF_COMMAND_DOWN, ui::VKEY_F5, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F6, ui::EF_COMMAND_DOWN, ui::VKEY_F6, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F7, ui::EF_COMMAND_DOWN, ui::VKEY_F7, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F8, ui::EF_COMMAND_DOWN, ui::VKEY_F8, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F9, ui::EF_COMMAND_DOWN, ui::VKEY_F9, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F10, ui::EF_COMMAND_DOWN, ui::VKEY_F10, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F11, ui::EF_COMMAND_DOWN, ui::VKEY_F11, ui::EF_FUNCTION_KEY},
+ {ui::VKEY_F12, ui::EF_COMMAND_DOWN, ui::VKEY_F12, ui::EF_FUNCTION_KEY},
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) {
@@ -1446,7 +1460,8 @@ TEST_F(EventRewriterAshTest, TopRowKeysAreFunctionKeys) {
ASSERT_FALSE(RewriteFunctionKeys(press_f1, &rewritten_event));
ASSERT_FALSE(rewritten_event);
EXPECT_EQ(
- GetExpectedResultAsString(ui::VKEY_F1, ui::EF_NONE, ui::ET_KEY_PRESSED),
+ GetExpectedResultAsString(ui::VKEY_F1, ui::EF_FUNCTION_KEY,
+ ui::ET_KEY_PRESSED),
GetKeyEventAsString(press_f1));
// The event should also not be rewritten if the send-function-keys pref is
@@ -1458,7 +1473,8 @@ TEST_F(EventRewriterAshTest, TopRowKeysAreFunctionKeys) {
ASSERT_FALSE(RewriteFunctionKeys(press_f1, &rewritten_event));
ASSERT_FALSE(rewritten_event);
EXPECT_EQ(
- GetExpectedResultAsString(ui::VKEY_F1, ui::EF_NONE, ui::ET_KEY_PRESSED),
+ GetExpectedResultAsString(ui::VKEY_F1, ui::EF_FUNCTION_KEY,
+ ui::ET_KEY_PRESSED),
GetKeyEventAsString(press_f1));
// If the pref isn't set when an event is sent to a regular window, F1 is
@@ -1467,7 +1483,8 @@ TEST_F(EventRewriterAshTest, TopRowKeysAreFunctionKeys) {
ASSERT_TRUE(RewriteFunctionKeys(press_f1, &rewritten_event));
ASSERT_TRUE(rewritten_event);
EXPECT_EQ(GetExpectedResultAsString(
- ui::VKEY_BROWSER_BACK, ui::EF_NONE, ui::ET_KEY_PRESSED),
+ ui::VKEY_BROWSER_BACK, ui::EF_FUNCTION_KEY,
+ ui::ET_KEY_PRESSED),
GetKeyEventAsString(
*static_cast<const ui::KeyEvent*>(rewritten_event.get())));
}
« ash/wm/maximize_mode/maximize_mode_event_blocker.cc ('K') | « chrome/browser/chromeos/events/event_rewriter.cc ('k') | ui/events/event_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698