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

Unified Diff: ui/views/focus/focus_manager_unittest.cc

Issue 10446010: wip: Add ui::EventType parameter. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wip - views_unittests Created 8 years, 7 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
« no previous file with comments | « ui/views/focus/focus_manager.cc ('k') | ui/views/window/dialog_client_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « ui/views/focus/focus_manager.cc ('k') | ui/views/window/dialog_client_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698