diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 18:11:54 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 18:11:54 +0000 |
| commit | 86ccbd412375d364cd2e1ea6fabbe696998828fe (patch) | |
| tree | 4891f52890bbc3a39983b25229660a4822b1412a /ash/accelerators | |
| parent | c51461c08853fd38c3eccda1646cfcc3ceff7b06 (diff) | |
| download | chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.zip chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.tar.gz chromium_src-86ccbd412375d364cd2e1ea6fabbe696998828fe.tar.bz2 | |
Moves ui/base/events to ui/events
BUG=none
TEST=none
R=ben@chromium.org
TBR=brettw@chromium.org, scherkus@chromium.org, ananta@chromium.org,
Review URL: https://codereview.chromium.org/23851041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_dispatcher.cc | 6 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_filter.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_filter.h | 2 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_table.h | 2 | ||||
| -rw-r--r-- | ash/accelerators/nested_dispatcher_controller_unittest.cc | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 32d627f..108cb3b 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -56,11 +56,11 @@ #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" -#include "ui/base/events/event.h" #include "ui/compositor/debug_utils.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/layer_animator.h" +#include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/screen.h" #include "ui/oak/oak.h" diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index bc709b2..6c6355f 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -22,7 +22,7 @@ #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #if defined(USE_X11) #include <X11/Xlib.h> diff --git a/ash/accelerators/accelerator_dispatcher.cc b/ash/accelerators/accelerator_dispatcher.cc index 91f0154..d023c6e 100644 --- a/ash/accelerators/accelerator_dispatcher.cc +++ b/ash/accelerators/accelerator_dispatcher.cc @@ -19,9 +19,9 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #include "ui/views/controls/menu/menu_controller.h" namespace ash { diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc index 892beab..ab7acd3 100644 --- a/ash/accelerators/accelerator_filter.cc +++ b/ash/accelerators/accelerator_filter.cc @@ -10,7 +10,7 @@ #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" namespace ash { namespace { diff --git a/ash/accelerators/accelerator_filter.h b/ash/accelerators/accelerator_filter.h index a43241a..1df7637 100644 --- a/ash/accelerators/accelerator_filter.h +++ b/ash/accelerators/accelerator_filter.h @@ -8,7 +8,7 @@ #include "ash/ash_export.h" #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" namespace ash { namespace internal { diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h index 6de8125..7d23adf 100644 --- a/ash/accelerators/accelerator_table.h +++ b/ash/accelerators/accelerator_table.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" #include "base/basictypes.h" -#include "ui/base/events/event_constants.h" +#include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" namespace ash { diff --git a/ash/accelerators/nested_dispatcher_controller_unittest.cc b/ash/accelerators/nested_dispatcher_controller_unittest.cc index 8b0f6a5..4c07232 100644 --- a/ash/accelerators/nested_dispatcher_controller_unittest.cc +++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc @@ -15,8 +15,8 @@ #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/events/event_constants.h" -#include "ui/base/events/event_utils.h" +#include "ui/events/event_constants.h" +#include "ui/events/event_utils.h" #if defined(USE_X11) #include <X11/Xlib.h> |