| Index: views/view_unittest.cc
|
| diff --git a/views/view_unittest.cc b/views/view_unittest.cc
|
| index 870273ef9bded387c9cdd1aa54ea8f46a427017a..a44ce6f260fee2d78c94013ef7e5ba32a56ccd4d 100644
|
| --- a/views/view_unittest.cc
|
| +++ b/views/view_unittest.cc
|
| @@ -5,7 +5,7 @@
|
| #include <map>
|
|
|
| #include "app/clipboard/clipboard.h"
|
| -#include "base/keyboard_codes.h"
|
| +#include "app/keyboard_codes.h"
|
| #include "base/message_loop.h"
|
| #include "base/string_util.h"
|
| #include "base/utf_string_conversions.h"
|
| @@ -828,7 +828,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(app::VKEY_RETURN, false, false, false);
|
| TestView* view = new TestView();
|
| view->Reset();
|
| view->AddAccelerator(return_accelerator);
|
| @@ -852,7 +852,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(app::VKEY_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);
|
| @@ -1108,7 +1108,7 @@ class DefaultButtonTest : public ViewTest {
|
| }
|
|
|
| void SimularePressingEnterAndCheckDefaultButton(ButtonID button_id) {
|
| - KeyEvent event(Event::ET_KEY_PRESSED, base::VKEY_RETURN, 0, 0, 0);
|
| + KeyEvent event(Event::ET_KEY_PRESSED, app::VKEY_RETURN, 0, 0, 0);
|
| focus_manager_->OnKeyEvent(event);
|
| switch (button_id) {
|
| case OK:
|
|
|