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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1117173003: Converting (Alt+LeftClick -> RightClick) to (Search+LeftClick -> RightClick) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a test, and addressed comments 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
« ash/accelerators/accelerator_filter_unittest.cc ('K') | « chrome/browser/chromeos/events/event_rewriter.cc ('k') | ui/base/accelerators/accelerator_history.h » ('j') | ui/wm/core/accelerator_filter.cc » ('J')
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 ea0753385f7044cfddacbafe36d712ac49245728..361040c80d2958705df2595ab032c7b9a13a90f6 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -1939,18 +1939,18 @@ TEST_F(EventRewriterTest, TestRewrittenModifierClick) {
device_list.push_back(10);
ui::TouchFactory::GetInstance()->SetPointerDeviceForTest(device_list);
- // Remap Control to Alt.
+ // Remap Control to Search.
TestingPrefServiceSyncable prefs;
chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
IntegerPrefMember control;
control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
- control.SetValue(chromeos::input_method::kAltKey);
+ control.SetValue(chromeos::input_method::kSearchKey);
EventRewriter rewriter(NULL);
rewriter.KeyboardDeviceAddedForTesting(kKeyboardDeviceId, "PC Keyboard");
rewriter.set_pref_service_for_testing(&prefs);
- // Check that Control + Left Button is converted (via Alt + Left Button)
+ // Check that Control + Left Button is converted (via Search + Left Button)
// to Right Button.
ui::ScopedXI2Event xev;
xev.InitGenericButtonEvent(10,
@@ -1967,7 +1967,7 @@ TEST_F(EventRewriterTest, TestRewrittenModifierClick) {
EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags());
EXPECT_FALSE(ui::EF_LEFT_MOUSE_BUTTON & result->flags());
EXPECT_FALSE(ui::EF_CONTROL_DOWN & result->flags());
- EXPECT_FALSE(ui::EF_ALT_DOWN & result->flags());
+ EXPECT_FALSE(ui::EF_COMMAND_DOWN & result->flags());
EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags());
}
@@ -1981,28 +1981,28 @@ TEST_F(EventRewriterTest, DontRewriteIfNotRewritten) {
TestingPrefServiceSyncable prefs;
EventRewriter rewriter(NULL);
rewriter.set_pref_service_for_testing(&prefs);
- const int kLeftAndAltFlag = ui::EF_LEFT_MOUSE_BUTTON | ui::EF_ALT_DOWN;
+ const int kLeftAndSearchFlag = ui::EF_LEFT_MOUSE_BUTTON | ui::EF_COMMAND_DOWN;
- // Test Alt + Left click.
+ // Test Search + Left click.
{
ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
- ui::EventTimeForNow(), kLeftAndAltFlag,
+ ui::EventTimeForNow(), kLeftAndSearchFlag,
ui::EF_LEFT_MOUSE_BUTTON);
ui::EventTestApi test_press(&press);
test_press.set_source_device_id(10);
// Sanity check.
EXPECT_EQ(ui::ET_MOUSE_PRESSED, press.type());
- EXPECT_EQ(kLeftAndAltFlag, press.flags());
+ EXPECT_EQ(kLeftAndSearchFlag, press.flags());
scoped_ptr<ui::Event> new_event;
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, press, &new_event);
EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags());
- EXPECT_FALSE(kLeftAndAltFlag & result->flags());
+ EXPECT_FALSE(kLeftAndSearchFlag & result->flags());
EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags());
}
{
ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
- ui::EventTimeForNow(), kLeftAndAltFlag,
+ ui::EventTimeForNow(), kLeftAndSearchFlag,
ui::EF_LEFT_MOUSE_BUTTON);
ui::EventTestApi test_release(&release);
test_release.set_source_device_id(10);
@@ -2010,41 +2010,41 @@ TEST_F(EventRewriterTest, DontRewriteIfNotRewritten) {
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, release, &new_event);
EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags());
- EXPECT_FALSE(kLeftAndAltFlag & result->flags());
+ EXPECT_FALSE(kLeftAndSearchFlag & result->flags());
EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags());
}
#if defined(USE_X11)
- // Test Alt + Left click, using XI2 native events.
+ // Test Search + Left click, using XI2 native events.
{
ui::ScopedXI2Event xev;
- xev.InitGenericButtonEvent(
- 10, ui::ET_MOUSE_PRESSED, gfx::Point(), kLeftAndAltFlag);
+ xev.InitGenericButtonEvent(10, ui::ET_MOUSE_PRESSED, gfx::Point(),
+ kLeftAndSearchFlag);
ui::MouseEvent press(xev);
// Sanity check.
EXPECT_EQ(ui::ET_MOUSE_PRESSED, press.type());
- EXPECT_EQ(kLeftAndAltFlag, press.flags());
+ EXPECT_EQ(kLeftAndSearchFlag, press.flags());
scoped_ptr<ui::Event> new_event;
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, press, &new_event);
EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags());
- EXPECT_FALSE(kLeftAndAltFlag & result->flags());
+ EXPECT_FALSE(kLeftAndSearchFlag & result->flags());
EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags());
}
{
ui::ScopedXI2Event xev;
- xev.InitGenericButtonEvent(
- 10, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag);
+ xev.InitGenericButtonEvent(10, ui::ET_MOUSE_RELEASED, gfx::Point(),
+ kLeftAndSearchFlag);
ui::MouseEvent release(xev);
scoped_ptr<ui::Event> new_event;
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, release, &new_event);
EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags());
- EXPECT_FALSE(kLeftAndAltFlag & result->flags());
+ EXPECT_FALSE(kLeftAndSearchFlag & result->flags());
EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags());
}
#endif
- // No ALT in frst click.
+ // No SEARCH in first click.
{
ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
@@ -2059,18 +2059,18 @@ TEST_F(EventRewriterTest, DontRewriteIfNotRewritten) {
}
{
ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
- ui::EventTimeForNow(), kLeftAndAltFlag,
+ ui::EventTimeForNow(), kLeftAndSearchFlag,
ui::EF_LEFT_MOUSE_BUTTON);
ui::EventTestApi test_release(&release);
test_release.set_source_device_id(10);
scoped_ptr<ui::Event> new_event;
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, release, &new_event);
- EXPECT_TRUE((ui::EF_LEFT_MOUSE_BUTTON | ui::EF_ALT_DOWN) & result->flags());
+ EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_COMMAND_DOWN, result->flags());
EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags());
}
#if defined(USE_X11)
- // No ALT in frst click, using XI2 native events.
+ // No SEARCH in first click, using XI2 native events.
{
ui::ScopedXI2Event xev;
xev.InitGenericButtonEvent(
@@ -2084,21 +2084,21 @@ TEST_F(EventRewriterTest, DontRewriteIfNotRewritten) {
}
{
ui::ScopedXI2Event xev;
- xev.InitGenericButtonEvent(
- 10, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag);
+ xev.InitGenericButtonEvent(10, ui::ET_MOUSE_RELEASED, gfx::Point(),
+ kLeftAndSearchFlag);
ui::MouseEvent release(xev);
scoped_ptr<ui::Event> new_event;
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, release, &new_event);
- EXPECT_TRUE((ui::EF_LEFT_MOUSE_BUTTON | ui::EF_ALT_DOWN) & result->flags());
+ EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_COMMAND_DOWN, result->flags());
EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags());
}
#endif
- // ALT on different device.
+ // SEARCH on different device.
{
ui::MouseEvent press(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
- ui::EventTimeForNow(), kLeftAndAltFlag,
+ ui::EventTimeForNow(), kLeftAndSearchFlag,
ui::EF_LEFT_MOUSE_BUTTON);
ui::EventTestApi test_press(&press);
test_press.set_source_device_id(11);
@@ -2106,24 +2106,24 @@ TEST_F(EventRewriterTest, DontRewriteIfNotRewritten) {
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, press, &new_event);
EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags());
- EXPECT_FALSE(kLeftAndAltFlag & result->flags());
+ EXPECT_FALSE(kLeftAndSearchFlag & result->flags());
EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags());
}
{
ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
- ui::EventTimeForNow(), kLeftAndAltFlag,
+ ui::EventTimeForNow(), kLeftAndSearchFlag,
ui::EF_LEFT_MOUSE_BUTTON);
ui::EventTestApi test_release(&release);
test_release.set_source_device_id(10);
scoped_ptr<ui::Event> new_event;
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, release, &new_event);
- EXPECT_TRUE((ui::EF_LEFT_MOUSE_BUTTON | ui::EF_ALT_DOWN) & result->flags());
+ EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_COMMAND_DOWN, result->flags());
EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags());
}
{
ui::MouseEvent release(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
- ui::EventTimeForNow(), kLeftAndAltFlag,
+ ui::EventTimeForNow(), kLeftAndSearchFlag,
ui::EF_LEFT_MOUSE_BUTTON);
ui::EventTestApi test_release(&release);
test_release.set_source_device_id(11);
@@ -2131,44 +2131,44 @@ TEST_F(EventRewriterTest, DontRewriteIfNotRewritten) {
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, release, &new_event);
EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags());
- EXPECT_FALSE(kLeftAndAltFlag & result->flags());
+ EXPECT_FALSE(kLeftAndSearchFlag & result->flags());
EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags());
}
#if defined(USE_X11)
- // ALT on different device, using XI2 native events.
+ // SEARCH on different device, using XI2 native events.
{
ui::ScopedXI2Event xev;
- xev.InitGenericButtonEvent(
- 11, ui::ET_MOUSE_PRESSED, gfx::Point(), kLeftAndAltFlag);
+ xev.InitGenericButtonEvent(11, ui::ET_MOUSE_PRESSED, gfx::Point(),
+ kLeftAndSearchFlag);
ui::MouseEvent press(xev);
scoped_ptr<ui::Event> new_event;
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, press, &new_event);
EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags());
- EXPECT_FALSE(kLeftAndAltFlag & result->flags());
+ EXPECT_FALSE(kLeftAndSearchFlag & result->flags());
EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags());
}
{
ui::ScopedXI2Event xev;
- xev.InitGenericButtonEvent(
- 10, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag);
+ xev.InitGenericButtonEvent(10, ui::ET_MOUSE_RELEASED, gfx::Point(),
+ kLeftAndSearchFlag);
ui::MouseEvent release(xev);
scoped_ptr<ui::Event> new_event;
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, release, &new_event);
- EXPECT_TRUE((ui::EF_LEFT_MOUSE_BUTTON | ui::EF_ALT_DOWN) & result->flags());
+ EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON | ui::EF_COMMAND_DOWN, result->flags());
EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, result->changed_button_flags());
}
{
ui::ScopedXI2Event xev;
- xev.InitGenericButtonEvent(
- 11, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag);
+ xev.InitGenericButtonEvent(11, ui::ET_MOUSE_RELEASED, gfx::Point(),
+ kLeftAndSearchFlag);
ui::MouseEvent release(xev);
scoped_ptr<ui::Event> new_event;
const ui::MouseEvent* result =
RewriteMouseButtonEvent(&rewriter, release, &new_event);
EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & result->flags());
- EXPECT_FALSE(kLeftAndAltFlag & result->flags());
+ EXPECT_FALSE(kLeftAndSearchFlag & result->flags());
EXPECT_EQ(ui::EF_RIGHT_MOUSE_BUTTON, result->changed_button_flags());
}
#endif
« ash/accelerators/accelerator_filter_unittest.cc ('K') | « chrome/browser/chromeos/events/event_rewriter.cc ('k') | ui/base/accelerators/accelerator_history.h » ('j') | ui/wm/core/accelerator_filter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698