diff options
| author | kpschoedel@chromium.org <kpschoedel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 17:10:17 +0000 |
|---|---|---|
| committer | kpschoedel@chromium.org <kpschoedel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 17:10:17 +0000 |
| commit | 947211d035a701096dfd2641c14c348b897ee8f4 (patch) | |
| tree | 24749f5a778bf736ca9758a8f6fddebaadb36b09 /ash/accelerators/accelerator_controller_unittest.cc | |
| parent | 7225f8584c2672e7ea20514f6f79dfe42aa670e9 (diff) | |
| download | chromium_src-947211d035a701096dfd2641c14c348b897ee8f4.zip chromium_src-947211d035a701096dfd2641c14c348b897ee8f4.tar.gz chromium_src-947211d035a701096dfd2641c14c348b897ee8f4.tar.bz2 | |
Distinguish between keystroke and character events.
As described in its class comment, a ui::KeyEvent can be either of two
distinct kinds. When constructing a ui::KeyEvent from a native event,
the distinction is made by a new IsCharFromNative() call, in the same
way that other ui::Event properties are determined, instead of having the
caller inspect the native event itself. Removing the redundant |is_char|
parameter from constructors also prevent accidental synthetic `mixed'
events that consuming code does not handle.
Incidentally, while KeyEvent constructor calls are being touched, use
EF_NONE instead of 0 to make that argument's purpose clear.
BUG=380349
TEST=unit_tests,ash_unittests,events_unittests,ui_unittests,interactive_ui_tests
Review URL: https://codereview.chromium.org/404203003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller_unittest.cc')
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 4fecc24..c5fc1cf 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -623,37 +623,37 @@ TEST_F(AcceleratorControllerTest, MAYBE_ProcessOnce) { Shell::GetPrimaryRootWindow()->GetHost()->event_processor(); #if defined(OS_WIN) MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 }; - ui::KeyEvent key_event1(msg1, false); + ui::KeyEvent key_event1(msg1); 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::KeyEvent key_event2(msg2, true); + ui::KeyEvent key_event2(msg2); 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::KeyEvent key_event3(msg3, false); + ui::KeyEvent key_event3(msg3); 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::KeyEvent key_event1(key_event, false); + ui::KeyEvent key_event1(key_event); key_event1.SetTranslated(true); ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1); EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed); - ui::KeyEvent key_event2(key_event, true); + ui::KeyEvent key_event2('A', ui::VKEY_A, ui::EF_NONE); 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::KeyEvent key_event3(key_event, false); + ui::KeyEvent key_event3(key_event); key_event3.SetTranslated(true); details = dispatcher->OnEventFromSource(&key_event3); EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed); |