diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 23:35:31 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-23 23:35:31 +0000 |
| commit | b65bdda36c548cd680eecbbfcfbd482b740e2eb3 (patch) | |
| tree | f904be7f7f8db20269dbe2c76b28e325ec04bd28 /ash/drag_drop | |
| parent | ff00968f75fd1a82532b0009f535310db5a9556c (diff) | |
| download | chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.zip chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.tar.gz chromium_src-b65bdda36c548cd680eecbbfcfbd482b740e2eb3.tar.bz2 | |
Move last few files -> ash
http://crbug.com/108457
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/9036011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115743 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 | 4 |
2 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 b316d14..ef0cf6c 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -5,11 +5,11 @@ #include "ash/drag_drop/drag_drop_controller.h" #include "ash/drag_drop/drag_image_view.h" +#include "ash/shell.h" #include "base/message_loop.h" #include "ui/aura/client/drag_drop_delegate.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/aura_shell/shell.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" #include "ui/gfx/point.h" diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index b1aabf8..3c830cb 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -6,7 +6,7 @@ #define ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ #pragma once -#include "ui/aura_shell/aura_shell_export.h" +#include "ash/ash_export.h" #include "ui/aura/client/drag_drop_client.h" #include "ui/aura/event.h" #include "ui/aura/event_filter.h" @@ -28,7 +28,7 @@ namespace internal { class DragImageView; -class AURA_SHELL_EXPORT DragDropController +class ASH_EXPORT DragDropController : public aura::client::DragDropClient, public aura::EventFilter { public: |