diff options
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 18 | ||||
| -rw-r--r-- | ash/sticky_keys/sticky_keys_controller.cc | 4 | ||||
| -rw-r--r-- | ash/wm/overlay_event_filter.cc | 4 |
3 files changed, 14 insertions, 12 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 23d42d9..738c9d3 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -591,32 +591,38 @@ TEST_F(AcceleratorControllerTest, MAYBE_ProcessOnce) { Shell::GetPrimaryRootWindow()->GetHost()->event_processor(); #if defined(OS_WIN) MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 }; - ui::TranslatedKeyEvent key_event1(msg1, false); + ui::KeyEvent key_event1(msg1, false); + key_event1.SetTranslated(true); ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1); EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed); MSG msg2 = { NULL, WM_CHAR, L'A', 0 }; - ui::TranslatedKeyEvent key_event2(msg2, true); + ui::KeyEvent key_event2(msg2, true); + key_event2.SetTranslated(true); details = dispatcher->OnEventFromSource(&key_event2); EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed); MSG msg3 = { NULL, WM_KEYUP, ui::VKEY_A, 0 }; - ui::TranslatedKeyEvent key_event3(msg3, false); + ui::KeyEvent key_event3(msg3, false); + key_event3.SetTranslated(true); details = dispatcher->OnEventFromSource(&key_event3); EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed); #elif defined(USE_X11) ui::ScopedXI2Event key_event; key_event.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, 0); - ui::TranslatedKeyEvent key_event1(key_event, false); + ui::KeyEvent key_event1(key_event, false); + key_event1.SetTranslated(true); ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1); EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed); - ui::TranslatedKeyEvent key_event2(key_event, true); + ui::KeyEvent key_event2(key_event, true); + key_event2.SetTranslated(true); details = dispatcher->OnEventFromSource(&key_event2); EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed); key_event.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, 0); - ui::TranslatedKeyEvent key_event3(key_event, false); + ui::KeyEvent key_event3(key_event, false); + key_event3.SetTranslated(true); details = dispatcher->OnEventFromSource(&key_event3); EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed); #endif diff --git a/ash/sticky_keys/sticky_keys_controller.cc b/ash/sticky_keys/sticky_keys_controller.cc index a10bb61..53be1fc 100644 --- a/ash/sticky_keys/sticky_keys_controller.cc +++ b/ash/sticky_keys/sticky_keys_controller.cc @@ -181,10 +181,8 @@ bool StickyKeysController::HandleScrollEvent(ui::ScrollEvent* event) { void StickyKeysController::OnKeyEvent(ui::KeyEvent* event) { // Do not consume a translated key event which is generated by an IME. - if (event->type() == ui::ET_TRANSLATED_KEY_PRESS || - event->type() == ui::ET_TRANSLATED_KEY_RELEASE) { + if (event->IsTranslated()) return; - } if (enabled_) { if (HandleKeyEvent(event)) diff --git a/ash/wm/overlay_event_filter.cc b/ash/wm/overlay_event_filter.cc index 6221e5e..cd5a487 100644 --- a/ash/wm/overlay_event_filter.cc +++ b/ash/wm/overlay_event_filter.cc @@ -28,10 +28,8 @@ void OverlayEventFilter::OnKeyEvent(ui::KeyEvent* event) { // ui::VKEY_PROCESSKEY) since the key event is generated in response to a key // press or release before showing the ovelay. This is important not to // confuse key event handling JavaScript code in a page. - if (event->type() == ui::ET_TRANSLATED_KEY_PRESS || - event->type() == ui::ET_TRANSLATED_KEY_RELEASE) { + if (event->IsTranslated()) return; - } if (delegate_ && delegate_->IsCancelingKeyEvent(event)) Cancel(); |