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 /webkit/support | |
| 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 'webkit/support')
| -rw-r--r-- | webkit/support/DEPS | 1 | ||||
| -rw-r--r-- | webkit/support/webkit_support.h | 28 |
2 files changed, 14 insertions, 15 deletions
diff --git a/webkit/support/DEPS b/webkit/support/DEPS index b42ea7d..e27e2eb 100644 --- a/webkit/support/DEPS +++ b/webkit/support/DEPS @@ -1,4 +1,3 @@ include_rules = [ - "+app", "+media" ] diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h index 6c17de2..0cb00b8 100644 --- a/webkit/support/webkit_support.h +++ b/webkit/support/webkit_support.h @@ -7,8 +7,8 @@ #include <string> -#include "app/keyboard_codes.h" #include "base/basictypes.h" +#include "base/keyboard_codes.h" #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgentClient.h" class Task; @@ -155,19 +155,19 @@ WebKit::WebURL GetDevToolsPathAsURL(); // -------- Keyboard code enum { - VKEY_LEFT = app::VKEY_LEFT, - VKEY_RIGHT = app::VKEY_RIGHT, - VKEY_UP = app::VKEY_UP, - VKEY_DOWN = app::VKEY_DOWN, - VKEY_RETURN = app::VKEY_RETURN, - VKEY_INSERT = app::VKEY_INSERT, - VKEY_DELETE = app::VKEY_DELETE, - VKEY_PRIOR = app::VKEY_PRIOR, - VKEY_NEXT = app::VKEY_NEXT, - VKEY_HOME = app::VKEY_HOME, - VKEY_END = app::VKEY_END, - VKEY_SNAPSHOT = app::VKEY_SNAPSHOT, - VKEY_F1 = app::VKEY_F1, + VKEY_LEFT = base::VKEY_LEFT, + VKEY_RIGHT = base::VKEY_RIGHT, + VKEY_UP = base::VKEY_UP, + VKEY_DOWN = base::VKEY_DOWN, + VKEY_RETURN = base::VKEY_RETURN, + VKEY_INSERT = base::VKEY_INSERT, + VKEY_DELETE = base::VKEY_DELETE, + VKEY_PRIOR = base::VKEY_PRIOR, + VKEY_NEXT = base::VKEY_NEXT, + VKEY_HOME = base::VKEY_HOME, + VKEY_END = base::VKEY_END, + VKEY_SNAPSHOT = base::VKEY_SNAPSHOT, + VKEY_F1 = base::VKEY_F1, }; } // namespace webkit_support |