summaryrefslogtreecommitdiffstats
path: root/content/browser/browser_plugin
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-17 23:31:16 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-17 23:31:16 +0000
commit7e9acd08b34f56b7eab5f9d93a8c69c556d5b0c7 (patch)
tree8a309abf13991f5f5998c8071b902100ecb7b199 /content/browser/browser_plugin
parentb1d571afd4400219ee44bd15ac9cea7f0ff8e31f (diff)
downloadchromium_src-7e9acd08b34f56b7eab5f9d93a8c69c556d5b0c7.zip
chromium_src-7e9acd08b34f56b7eab5f9d93a8c69c556d5b0c7.tar.gz
chromium_src-7e9acd08b34f56b7eab5f9d93a8c69c556d5b0c7.tar.bz2
Moves most files from ui/base/keycodes to ui/events/keycodes
I'm leaving usb_keycodes_map in ui/base for now. BUG=none TEST=none R=ben@chromium.org, benm@chromium.org, scherkus@chromium.org TBR=benm@chromium.org, brettw@chromium.org, scherkus@chromium.org Review URL: https://codereview.chromium.org/23480084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_plugin')
-rw-r--r--content/browser/browser_plugin/browser_plugin_guest.cc2
-rw-r--r--content/browser/browser_plugin/browser_plugin_guest_manager.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index 5960c95..f7fd737 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -46,7 +46,7 @@
#include "content/public/common/url_utils.h"
#include "net/url_request/url_request.h"
#include "third_party/WebKit/public/web/WebCursorInfo.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/surface/transport_dib.h"
#include "webkit/common/resource_type.h"
diff --git a/content/browser/browser_plugin/browser_plugin_guest_manager.cc b/content/browser/browser_plugin/browser_plugin_guest_manager.cc
index 75de203..6c86331b 100644
--- a/content/browser/browser_plugin/browser_plugin_guest_manager.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest_manager.cc
@@ -17,7 +17,7 @@
#include "content/public/common/result_codes.h"
#include "content/public/common/url_constants.h"
#include "net/base/escape.h"
-#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/events/keycodes/keyboard_codes.h"
namespace content {