diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 19:09:06 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 19:09:06 +0000 |
| commit | 92258389a1a4190987f3b4a64386fd9eb0f126ea (patch) | |
| tree | 567ea0779660a7f822289f3c945721f2e9d6fad1 /views/widget/root_view.cc | |
| parent | 47fa280c2ff011bb948a9978687418079731a854 (diff) | |
| download | chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.zip chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.gz chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/root_view.cc')
| -rw-r--r-- | views/widget/root_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc index 20464cc..a56ec99 100644 --- a/views/widget/root_view.cc +++ b/views/widget/root_view.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "app/drag_drop_types.h" -#include "app/keyboard_codes.h" +#include "base/keyboard_codes.h" #include "base/logging.h" #include "base/message_loop.h" #include "gfx/canvas_skia.h" @@ -581,8 +581,8 @@ bool RootView::ProcessKeyEvent(const KeyEvent& event) { View* v = GetFocusedView(); // Special case to handle right-click context menus triggered by the // keyboard. - if (v && v->IsEnabled() && ((event.GetKeyCode() == app::VKEY_APPS) || - (event.GetKeyCode() == app::VKEY_F10 && event.IsShiftDown()))) { + if (v && v->IsEnabled() && ((event.GetKeyCode() == base::VKEY_APPS) || + (event.GetKeyCode() == base::VKEY_F10 && event.IsShiftDown()))) { v->ShowContextMenu(v->GetKeyboardContextMenuLocation(), false); return true; } |