diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 19:45:01 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 19:45:01 +0000 |
| commit | af4552b2cae3064ea81de296a821c6657f8c946c (patch) | |
| tree | a8b426170bbfe9de52518973b4e485157053a76a /ash/drag_drop | |
| parent | 0e2c717e6168b2a3c59263ca03bdb6e5fdbfd262 (diff) | |
| download | chromium_src-af4552b2cae3064ea81de296a821c6657f8c946c.zip chromium_src-af4552b2cae3064ea81de296a821c6657f8c946c.tar.gz chromium_src-af4552b2cae3064ea81de296a821c6657f8c946c.tar.bz2 | |
Move some code from aura/client to wm/public
Still building as part of the aura target, will fix that in a future step.
TBR=sky@chromium.org
http://crbug.com/308710
Review URL: https://codereview.chromium.org/206453005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258651 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 2 | ||||
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.h | 2 | ||||
| -rw-r--r-- | ash/drag_drop/drag_drop_tracker.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 472172b..4df5f71 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -12,7 +12,6 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "ui/aura/client/capture_client.h" -#include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" @@ -29,6 +28,7 @@ #include "ui/gfx/rect_conversions.h" #include "ui/views/views_delegate.h" #include "ui/views/widget/native_widget_aura.h" +#include "ui/wm/public/drag_drop_delegate.h" namespace ash { namespace internal { diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index a9220db..5d05ec9 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -8,13 +8,13 @@ #include "ash/ash_export.h" #include "base/callback.h" #include "base/memory/weak_ptr.h" -#include "ui/aura/client/drag_drop_client.h" #include "ui/aura/window_observer.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/events/event_constants.h" #include "ui/events/event_handler.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/rect.h" +#include "ui/wm/public/drag_drop_client.h" namespace gfx { class LinearAnimation; diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc index 48badf3..55cb7b9 100644 --- a/ash/drag_drop/drag_drop_tracker.cc +++ b/ash/drag_drop/drag_drop_tracker.cc @@ -7,12 +7,12 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/wm/coordinate_conversion.h" -#include "ui/aura/client/activation_delegate.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/events/event.h" #include "ui/gfx/screen.h" +#include "ui/wm/public/activation_delegate.h" namespace ash { namespace internal { |