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/shelf | |
| 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/shelf')
| -rw-r--r-- | ash/shelf/overflow_bubble.cc | 2 | ||||
| -rw-r--r-- | ash/shelf/overflow_bubble.h | 2 | ||||
| -rw-r--r-- | ash/shelf/shelf_bezel_event_filter.h | 2 | ||||
| -rw-r--r-- | ash/shelf/shelf_layout_manager.cc | 4 | ||||
| -rw-r--r-- | ash/shelf/shelf_widget.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/ash/shelf/overflow_bubble.cc b/ash/shelf/overflow_bubble.cc index 6bf2f96..84a3b8b 100644 --- a/ash/shelf/overflow_bubble.cc +++ b/ash/shelf/overflow_bubble.cc @@ -15,7 +15,7 @@ #include "ash/system/tray/system_tray.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" +#include "ui/events/event.h" #include "ui/gfx/insets.h" #include "ui/gfx/screen.h" #include "ui/views/bubble/bubble_delegate.h" diff --git a/ash/shelf/overflow_bubble.h b/ash/shelf/overflow_bubble.h index 1d4dcb9..2b1cf6d 100644 --- a/ash/shelf/overflow_bubble.h +++ b/ash/shelf/overflow_bubble.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/views/widget/widget_observer.h" namespace ui { diff --git a/ash/shelf/shelf_bezel_event_filter.h b/ash/shelf/shelf_bezel_event_filter.h index 5390c4e..33d1f5e 100644 --- a/ash/shelf/shelf_bezel_event_filter.h +++ b/ash/shelf/shelf_bezel_event_filter.h @@ -6,7 +6,7 @@ #define ASH_SHELF_SHELF_BEZEL_EVENT_FILTER_H_ #include "ash/wm/gestures/shelf_gesture_handler.h" -#include "ui/base/events/event_handler.h" +#include "ui/events/event_handler.h" #include "ui/gfx/rect.h" namespace ash { diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 0d94aa4..e023ed8 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -38,13 +38,13 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/root_window.h" -#include "ui/base/events/event.h" -#include "ui/base/events/event_handler.h" #include "ui/base/ui_base_switches.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/compositor/layer_animator.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event.h" +#include "ui/events/event_handler.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index b5bb8cd..b98d7a9ef 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc @@ -26,10 +26,10 @@ #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" -#include "ui/base/events/event_constants.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/events/event_constants.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia_operations.h" |