diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-25 00:36:27 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-25 00:36:27 +0000 |
| commit | e5ae465879f6d180455e0434147445acfbb6b283 (patch) | |
| tree | 182a7d4dd676b2b59b214d1f65d270eda6482016 /ash | |
| parent | 6648bcd72c2410583526db8b0c07ec8e784d8353 (diff) | |
| download | chromium_src-e5ae465879f6d180455e0434147445acfbb6b283.zip chromium_src-e5ae465879f6d180455e0434147445acfbb6b283.tar.gz chromium_src-e5ae465879f6d180455e0434147445acfbb6b283.tar.bz2 | |
events: Move gestures out of ui/base/ into ui/events/.
BUG=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/24413002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/wm/caption_buttons/frame_maximize_button_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/wm/gestures/long_press_affordance_handler.cc | 6 | ||||
| -rw-r--r-- | ash/wm/gestures/system_pinch_handler.cc | 2 | ||||
| -rw-r--r-- | ash/wm/system_gesture_event_filter_unittest.cc | 2 | ||||
| -rw-r--r-- | ash/wm/toplevel_window_event_handler.cc | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index 0cd770e..0538002 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -19,10 +19,10 @@ #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/gestures/gesture_types.h" #include "ui/base/ui_base_switches.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" +#include "ui/events/gestures/gesture_types.h" #include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/image/image_skia_rep.h" #include "ui/views/test/test_views_delegate.h" diff --git a/ash/wm/caption_buttons/frame_maximize_button_unittest.cc b/ash/wm/caption_buttons/frame_maximize_button_unittest.cc index e1af265..ce1155b 100644 --- a/ash/wm/caption_buttons/frame_maximize_button_unittest.cc +++ b/ash/wm/caption_buttons/frame_maximize_button_unittest.cc @@ -18,8 +18,8 @@ #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" -#include "ui/base/gestures/gesture_configuration.h" #include "ui/events/event_utils.h" +#include "ui/events/gestures/gesture_configuration.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/wm/gestures/long_press_affordance_handler.cc b/ash/wm/gestures/long_press_affordance_handler.cc index 516f4c7..aae7e1a 100644 --- a/ash/wm/gestures/long_press_affordance_handler.cc +++ b/ash/wm/gestures/long_press_affordance_handler.cc @@ -5,8 +5,8 @@ #include "ash/wm/gestures/long_press_affordance_handler.h" #include "ash/display/display_controller.h" -#include "ash/shell.h" #include "ash/root_window_controller.h" +#include "ash/shell.h" #include "ash/shell_window_ids.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPaint.h" @@ -16,9 +16,9 @@ #include "ui/aura/client/screen_position_client.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/base/gestures/gesture_configuration.h" -#include "ui/base/gestures/gesture_util.h" #include "ui/compositor/layer.h" +#include "ui/events/gestures/gesture_configuration.h" +#include "ui/events/gestures/gesture_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/screen.h" #include "ui/gfx/transform.h" diff --git a/ash/wm/gestures/system_pinch_handler.cc b/ash/wm/gestures/system_pinch_handler.cc index d2e7ce2..be776b5 100644 --- a/ash/wm/gestures/system_pinch_handler.cc +++ b/ash/wm/gestures/system_pinch_handler.cc @@ -13,9 +13,9 @@ #include "ash/wm/window_util.h" #include "ash/wm/workspace/snap_sizer.h" #include "ui/aura/window.h" -#include "ui/base/gestures/gesture_types.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/events/event_constants.h" +#include "ui/events/gestures/gesture_types.h" #include "ui/gfx/rect.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index 80ec248..dfa3b6f1 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc @@ -26,11 +26,11 @@ #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_windows.h" -#include "ui/base/gestures/gesture_configuration.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_switches.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" +#include "ui/events/gestures/gesture_configuration.h" #include "ui/gfx/screen.h" #include "ui/gfx/size.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc index 213f79d..46cf9c5d 100644 --- a/ash/wm/toplevel_window_event_handler.cc +++ b/ash/wm/toplevel_window_event_handler.cc @@ -20,13 +20,13 @@ #include "ui/aura/window_delegate.h" #include "ui/aura/window_observer.h" #include "ui/base/cursor/cursor.h" -#include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" +#include "ui/events/gestures/gesture_recognizer.h" #include "ui/gfx/screen.h" namespace { |