diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 23:31:16 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 23:31:16 +0000 |
| commit | 7e9acd08b34f56b7eab5f9d93a8c69c556d5b0c7 (patch) | |
| tree | 8a309abf13991f5f5998c8071b902100ecb7b199 /media | |
| parent | b1d571afd4400219ee44bd15ac9cea7f0ff8e31f (diff) | |
| download | chromium_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 'media')
| -rw-r--r-- | media/DEPS | 1 | ||||
| -rw-r--r-- | media/base/keyboard_event_counter.h | 2 | ||||
| -rw-r--r-- | media/base/user_input_monitor_linux.cc | 2 | ||||
| -rw-r--r-- | media/base/user_input_monitor_win.cc | 2 |
4 files changed, 4 insertions, 3 deletions
@@ -7,6 +7,7 @@ include_rules = [ "+third_party/opus", "+third_party/skia", "+ui/base", + "+ui/events", "+ui/gfx", "+ui/gl", ] diff --git a/media/base/keyboard_event_counter.h b/media/base/keyboard_event_counter.h index d8e76b0..873448d 100644 --- a/media/base/keyboard_event_counter.h +++ b/media/base/keyboard_event_counter.h @@ -10,7 +10,7 @@ #include "base/synchronization/lock.h" #include "media/base/media_export.h" #include "ui/base/events/event_constants.h" -#include "ui/base/keycodes/keyboard_codes.h" +#include "ui/events/keycodes/keyboard_codes.h" namespace media { diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc index 138de0a..b5dbbe5 100644 --- a/media/base/user_input_monitor_linux.cc +++ b/media/base/user_input_monitor_linux.cc @@ -23,7 +23,7 @@ #include "base/synchronization/lock.h" #include "media/base/keyboard_event_counter.h" #include "third_party/skia/include/core/SkPoint.h" -#include "ui/base/keycodes/keyboard_code_conversion_x.h" +#include "ui/events/keycodes/keyboard_code_conversion_x.h" // These includes need to be later than dictated by the style guide due to // Xlib header pollution, specifically the min, max, and Status macros. diff --git a/media/base/user_input_monitor_win.cc b/media/base/user_input_monitor_win.cc index bf923c7..13b826f 100644 --- a/media/base/user_input_monitor_win.cc +++ b/media/base/user_input_monitor_win.cc @@ -14,7 +14,7 @@ #include "base/win/message_window.h" #include "media/base/keyboard_event_counter.h" #include "third_party/skia/include/core/SkPoint.h" -#include "ui/base/keycodes/keyboard_code_conversion_win.h" +#include "ui/events/keycodes/keyboard_code_conversion_win.h" namespace media { namespace { |