| 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 a1777718ebca94efb2730f8c3b3eada72286914e..0c4a59fa8e15dac6de02eb477b522d611c092462 100644
|
| --- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
|
| +++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
|
| @@ -1618,8 +1618,6 @@ TEST_F(EventRewriterTest, TestRewriteExtendedKeysWithSearchRemapped) {
|
| }
|
|
|
| TEST_F(EventRewriterTest, TestRewriteKeyEventSentByXSendEvent) {
|
| -#if defined(USE_X11)
|
| - // TODO(kpschoedel): pending alternative to xevent.xany.send_event
|
| // Remap Control to Alt.
|
| TestingPrefServiceSyncable prefs;
|
| chromeos::Preferences::RegisterProfilePrefs(prefs.registry());
|
| @@ -1632,7 +1630,17 @@ TEST_F(EventRewriterTest, TestRewriteKeyEventSentByXSendEvent) {
|
| rewriter.set_pref_service_for_testing(&prefs);
|
|
|
| // Send left control press.
|
| - std::string rewritten_event;
|
| + {
|
| + ui::KeyEvent keyevent(
|
| + ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, ui::EF_FINAL_MODIFIERS, false);
|
| + scoped_ptr<ui::Event> new_event;
|
| + // Control should NOT be remapped to Alt if EF_FINAL_MODIFIERS is set.
|
| + EXPECT_EQ(ui::EVENT_REWRITE_CONTINUE,
|
| + rewriter.RewriteEvent(keyevent, &new_event));
|
| + EXPECT_FALSE(new_event);
|
| + }
|
| +#if defined(USE_X11)
|
| + // Send left control press, using XI2 native events.
|
| {
|
| ui::ScopedXI2Event xev;
|
| xev.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_CONTROL, 0);
|
|
|