diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 01:27:33 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 01:27:33 +0000 |
| commit | 07d294fbdd4efb893929386dadbec71b7ca7429a (patch) | |
| tree | d1af46a7c8966f116ca292d10f636fe0518f6cb0 /ui/views/view_unittest.cc | |
| parent | d79c13b4be9fe89b1f81bdde8ed0257b2ca6e4e0 (diff) | |
| download | chromium_src-07d294fbdd4efb893929386dadbec71b7ca7429a.zip chromium_src-07d294fbdd4efb893929386dadbec71b7ca7429a.tar.gz chromium_src-07d294fbdd4efb893929386dadbec71b7ca7429a.tar.bz2 | |
Pass event bitmask (shift, control, alt) to ui::Accelerator instead of booleans.
BUG=128242
R=ben@chromium.org
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10399044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/view_unittest.cc')
| -rw-r--r-- | ui/views/view_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index 71b606f..3ebd39e 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -1129,7 +1129,7 @@ bool TestView::AcceleratorPressed(const ui::Accelerator& accelerator) { #if defined(OS_WIN) && !defined(USE_AURA) TEST_F(ViewTest, ActivateAccelerator) { // Register a keyboard accelerator before the view is added to a window. - ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); + ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE); TestView* view = new TestView(); view->Reset(); view->AddAccelerator(return_accelerator); @@ -1154,7 +1154,7 @@ TEST_F(ViewTest, ActivateAccelerator) { EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1); // Hit the escape key. Nothing should happen. - ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, false, false, false); + ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, ui::EF_NONE); EXPECT_FALSE(focus_manager->ProcessAccelerator(escape_accelerator)); EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1); EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 0); @@ -1195,7 +1195,7 @@ TEST_F(ViewTest, ActivateAccelerator) { #if defined(OS_WIN) && !defined(USE_AURA) TEST_F(ViewTest, HiddenViewWithAccelerator) { - ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); + ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE); TestView* view = new TestView(); view->Reset(); view->AddAccelerator(return_accelerator); @@ -1225,7 +1225,7 @@ TEST_F(ViewTest, HiddenViewWithAccelerator) { #if defined(OS_WIN) && !defined(USE_AURA) TEST_F(ViewTest, ViewInHiddenWidgetWithAccelerator) { - ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false); + ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE); TestView* view = new TestView(); view->Reset(); view->AddAccelerator(return_accelerator); |