diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 16:39:26 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 16:39:26 +0000 |
| commit | 1eed61535cb6e15015edac43177ccdc25140855a (patch) | |
| tree | 843a3c3b42bfaadc54cd6c835e4c313965a0e177 /views/focus/focus_manager.cc | |
| parent | de6aadf4ddf69c76ddd60e03451fdbcb4061283f (diff) | |
| download | chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.zip chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.tar.gz chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.tar.bz2 | |
Move the keyboard files from base/ to app/.
Also moves the associated classes/enums from base:: to app::.
TEST=try bots compile
BUG=NONE
Review URL: http://codereview.chromium.org/3165064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus/focus_manager.cc')
| -rw-r--r-- | views/focus/focus_manager.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc index f0f5f99..3751ace 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(); } |