diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 21:32:30 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 21:32:30 +0000 |
| commit | a4d271ecbea5ed763d49919fac7bfabe788832f6 (patch) | |
| tree | c646a4d085142007968138c7ad26d1fb2aafe6a9 /views/view_unittest.cc | |
| parent | 19ff283d0e043c59206fdc2e890a2780933849fe (diff) | |
| download | chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.zip chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.tar.gz chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.tar.bz2 | |
Reverting 27412 it breaks the toolkit views Linux build.
TBR=sky
Review URL: http://codereview.chromium.org/254005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view_unittest.cc')
| -rw-r--r-- | views/view_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc index b15b101..bad592b 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -817,7 +817,7 @@ bool TestView::AcceleratorPressed(const Accelerator& accelerator) { #if defined(OS_WIN) TEST_F(ViewTest, ActivateAccelerator) { // Register a keyboard accelerator before the view is added to a window. - views::Accelerator return_accelerator(base::VKEY_RETURN, false, false, false); + views::Accelerator return_accelerator(VK_RETURN, false, false, false); TestView* view = new TestView(); view->Reset(); view->AddAccelerator(return_accelerator); @@ -841,7 +841,7 @@ TEST_F(ViewTest, ActivateAccelerator) { EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1); // Hit the escape key. Nothing should happen. - views::Accelerator escape_accelerator(base::VKEY_ESCAPE, false, false, false); + views::Accelerator escape_accelerator(VK_ESCAPE, false, false, false); 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); @@ -1097,7 +1097,7 @@ class DefaultButtonTest : public ViewTest { void SimularePressingEnterAndCheckDefaultButton(ButtonID button_id) { #if defined(OS_WIN) - KeyEvent event(Event::ET_KEY_PRESSED, base::VKEY_RETURN, 0, 0); + KeyEvent event(Event::ET_KEY_PRESSED, VK_RETURN, 0, 0); focus_manager_->OnKeyEvent(event); #else // TODO(platform) |