summaryrefslogtreecommitdiffstats
path: root/views/focus/focus_manager.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:54:58 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:54:58 +0000
commit0cc3dfe387313821853e658a6e2fb3b729eac9e5 (patch)
tree6bdf4d23c62ae78cafc6e7c5a2599cce70dfef22 /views/focus/focus_manager.cc
parent3c70591cc7d0d8cc162c10f7d3ac3b2ac15e4e69 (diff)
downloadchromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.zip
chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.gz
chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.bz2
Revert 58388 - Revert 58215 - Revert 58186 - 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 TBR=bryeung@chromium.org TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3361003 TBR=bryeung@chromium.org Review URL: http://codereview.chromium.org/3337006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus/focus_manager.cc')
-rw-r--r--views/focus/focus_manager.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index 3751ace..f0f5f99 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -12,7 +12,7 @@
#include <gtk/gtk.h>
#endif
-#include "app/keyboard_codes.h"
+#include "base/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.
- app::KeyboardCode key_code = event.GetKeyCode();
+ base::KeyboardCode key_code = event.GetKeyCode();
if (focused_view_ && focused_view_->GetGroup() != -1 &&
- (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);
+ (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);
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() == app::VKEY_TAB &&
+ return key_event.GetKeyCode() == base::VKEY_TAB &&
!key_event.IsControlDown();
}