From b6d81261a469240e25b41e7125bb7166ca3d35bb Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Thu, 13 Jan 2011 17:36:09 +0000 Subject: Move app/key* to ui/base/keycodes/* BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6246001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71330 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/support/DEPS | 3 ++- webkit/support/webkit_support.h | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'webkit/support') diff --git a/webkit/support/DEPS b/webkit/support/DEPS index b42ea7d..7cbc981 100644 --- a/webkit/support/DEPS +++ b/webkit/support/DEPS @@ -1,4 +1,5 @@ include_rules = [ "+app", - "+media" + "+media", + "+ui", ] diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h index 321a0bb..9150e0a 100644 --- a/webkit/support/webkit_support.h +++ b/webkit/support/webkit_support.h @@ -8,11 +8,11 @@ #include #include -#include "app/keyboard_codes.h" #include "base/basictypes.h" #include "base/string16.h" #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgentClient.h" #include "third_party/WebKit/WebKit/chromium/public/WebFileSystem.h" +#include "ui/base/keycodes/keyboard_codes.h" class WebURLLoaderMockFactory; namespace WebKit { @@ -161,19 +161,19 @@ void OpenFileSystem(WebKit::WebFrame* frame, WebKit::WebFileSystem::Type type, // -------- 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 = ui::VKEY_LEFT, + VKEY_RIGHT = ui::VKEY_RIGHT, + VKEY_UP = ui::VKEY_UP, + VKEY_DOWN = ui::VKEY_DOWN, + VKEY_RETURN = ui::VKEY_RETURN, + VKEY_INSERT = ui::VKEY_INSERT, + VKEY_DELETE = ui::VKEY_DELETE, + VKEY_PRIOR = ui::VKEY_PRIOR, + VKEY_NEXT = ui::VKEY_NEXT, + VKEY_HOME = ui::VKEY_HOME, + VKEY_END = ui::VKEY_END, + VKEY_SNAPSHOT = ui::VKEY_SNAPSHOT, + VKEY_F1 = ui::VKEY_F1, }; } // namespace webkit_support -- cgit v1.1