| Index: views/focus/focus_manager.cc
|
| diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
|
| index f0f5f9901e211ef5ef7d16af55b2838b79b1bae4..3751ace498021e0532c620516f1fc7984b3509a6 100644
|
| --- a/views/focus/focus_manager.cc
|
| +++ b/views/focus/focus_manager.cc
|
| @@ -12,7 +12,7 @@
|
| #include <gtk/gtk.h>
|
| #endif
|
|
|
| -#include "base/keyboard_codes.h"
|
| +#include "app/keyboard_codes.h"
|
| #include "base/logging.h"
|
| #include "views/accelerator.h"
|
| #include "views/focus/focus_search.h"
|
| @@ -109,11 +109,11 @@ bool FocusManager::OnKeyEvent(const KeyEvent& event) {
|
| #endif
|
|
|
| // Intercept arrow key messages to switch between grouped views.
|
| - base::KeyboardCode key_code = event.GetKeyCode();
|
| + app::KeyboardCode key_code = event.GetKeyCode();
|
| if (focused_view_ && focused_view_->GetGroup() != -1 &&
|
| - (key_code == base::VKEY_UP || key_code == base::VKEY_DOWN ||
|
| - key_code == base::VKEY_LEFT || key_code == base::VKEY_RIGHT)) {
|
| - bool next = (key_code == base::VKEY_RIGHT || key_code == base::VKEY_DOWN);
|
| + (key_code == app::VKEY_UP || key_code == app::VKEY_DOWN ||
|
| + key_code == app::VKEY_LEFT || key_code == app::VKEY_RIGHT)) {
|
| + bool next = (key_code == app::VKEY_RIGHT || key_code == app::VKEY_DOWN);
|
| std::vector<View*> views;
|
| focused_view_->GetParent()->GetViewsWithGroup(focused_view_->GetGroup(),
|
| &views);
|
| @@ -494,7 +494,7 @@ AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator(
|
|
|
| // static
|
| bool FocusManager::IsTabTraversalKeyEvent(const KeyEvent& key_event) {
|
| - return key_event.GetKeyCode() == base::VKEY_TAB &&
|
| + return key_event.GetKeyCode() == app::VKEY_TAB &&
|
| !key_event.IsControlDown();
|
| }
|
|
|
|
|