| Index: ui/views/focus/focus_manager_unittest.cc
|
| diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
|
| index b121e447441a19e645795498b20d7b70a249d2b4..23ba214d721af1c82695e0a0b90d5a0941626f0a 100644
|
| --- a/ui/views/focus/focus_manager_unittest.cc
|
| +++ b/ui/views/focus/focus_manager_unittest.cc
|
| @@ -214,8 +214,12 @@ class TestAcceleratorTarget : public ui::AcceleratorTarget {
|
|
|
| TEST_F(FocusManagerTest, CallsNormalAcceleratorTarget) {
|
| FocusManager* focus_manager = GetFocusManager();
|
| - ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
|
| - ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, ui::EF_NONE);
|
| + ui::Accelerator return_accelerator(ui::VKEY_RETURN,
|
| + ui::EF_NONE,
|
| + ui::ET_KEY_PRESSED);
|
| + ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE,
|
| + ui::EF_NONE,
|
| + ui::ET_KEY_PRESSED);
|
|
|
| TestAcceleratorTarget return_target(true);
|
| TestAcceleratorTarget escape_target(true);
|
| @@ -314,7 +318,9 @@ TEST_F(FocusManagerTest, CallsNormalAcceleratorTarget) {
|
|
|
| TEST_F(FocusManagerTest, HighPriorityHandlers) {
|
| FocusManager* focus_manager = GetFocusManager();
|
| - ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, ui::EF_NONE);
|
| + ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE,
|
| + ui::EF_NONE,
|
| + ui::ET_KEY_PRESSED);
|
|
|
| TestAcceleratorTarget escape_target_high(true);
|
| TestAcceleratorTarget escape_target_normal(true);
|
| @@ -403,7 +409,9 @@ TEST_F(FocusManagerTest, HighPriorityHandlers) {
|
|
|
| TEST_F(FocusManagerTest, CallsEnabledAcceleratorTargetsOnly) {
|
| FocusManager* focus_manager = GetFocusManager();
|
| - ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
|
| + ui::Accelerator return_accelerator(ui::VKEY_RETURN,
|
| + ui::EF_NONE,
|
| + ui::ET_KEY_PRESSED);
|
|
|
| TestAcceleratorTarget return_target1(true);
|
| TestAcceleratorTarget return_target2(true);
|
| @@ -471,7 +479,9 @@ class SelfUnregisteringAcceleratorTarget : public ui::AcceleratorTarget {
|
|
|
| TEST_F(FocusManagerTest, CallsSelfDeletingAcceleratorTarget) {
|
| FocusManager* focus_manager = GetFocusManager();
|
| - ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
|
| + ui::Accelerator return_accelerator(ui::VKEY_RETURN,
|
| + ui::EF_NONE,
|
| + ui::ET_KEY_PRESSED);
|
| SelfUnregisteringAcceleratorTarget target(return_accelerator, focus_manager);
|
| EXPECT_EQ(target.accelerator_count(), 0);
|
| EXPECT_EQ(NULL,
|
|
|