diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:54:58 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:54:58 +0000 |
| commit | 0cc3dfe387313821853e658a6e2fb3b729eac9e5 (patch) | |
| tree | 6bdf4d23c62ae78cafc6e7c5a2599cce70dfef22 /chrome/browser/gtk/browser_window_gtk.cc | |
| parent | 3c70591cc7d0d8cc162c10f7d3ac3b2ac15e4e69 (diff) | |
| download | chromium_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 'chrome/browser/gtk/browser_window_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index da1a13d..1cef421 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -9,10 +9,10 @@ #include <string> #include "app/gtk_util.h" -#include "app/keyboard_codes.h" #include "app/l10n_util.h" #include "base/base_paths.h" #include "base/command_line.h" +#include "base/keyboard_codes.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -299,8 +299,8 @@ bool ShouldExecuteReservedCommandImmediately( // Keys like Ctrl+w, Ctrl+n, etc. should always be sent to the renderer first, // otherwise some web apps or the Emacs key bindings may not work correctly. int vkey = event.windowsKeyCode; - if ((vkey >= app::VKEY_0 && vkey <= app::VKEY_9) || - (vkey >= app::VKEY_A && vkey <= app::VKEY_Z)) + if ((vkey >= base::VKEY_0 && vkey <= base::VKEY_9) || + (vkey >= base::VKEY_A && vkey <= base::VKEY_Z)) return false; // All other reserved accelerators should be processed immediately. |