diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 20:59:28 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 20:59:28 +0000 |
| commit | 093b8d64a16506cf8f2bd77d8b0cc7446065add3 (patch) | |
| tree | cc28b83de1bb4c9bfba0fc48c004405c97b95441 /ash/drag_drop/drag_drop_controller.h | |
| parent | e95d6cdbc67f44abb6e4254b869d1f704305d559 (diff) | |
| download | chromium_src-093b8d64a16506cf8f2bd77d8b0cc7446065add3.zip chromium_src-093b8d64a16506cf8f2bd77d8b0cc7446065add3.tar.gz chromium_src-093b8d64a16506cf8f2bd77d8b0cc7446065add3.tar.bz2 | |
Eliminate ash::internal namespace
Plus obvious style nit fixes.
BUG=None
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/224113005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/drag_drop/drag_drop_controller.h')
| -rw-r--r-- | ash/drag_drop/drag_drop_controller.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index 5d05ec9..7f20401 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -21,17 +21,14 @@ class LinearAnimation; } namespace ash { +class DragDropTracker; +class DragDropTrackerDelegate; +class DragImageView; namespace test { class DragDropControllerTest; } -namespace internal { - -class DragDropTracker; -class DragDropTrackerDelegate; -class DragImageView; - class ASH_EXPORT DragDropController : public aura::client::DragDropClient, public ui::EventHandler, @@ -122,7 +119,7 @@ class ASH_EXPORT DragDropController // Closure for quitting nested message loop. base::Closure quit_closure_; - scoped_ptr<ash::internal::DragDropTracker> drag_drop_tracker_; + scoped_ptr<ash::DragDropTracker> drag_drop_tracker_; scoped_ptr<DragDropTrackerDelegate> drag_drop_window_delegate_; ui::DragDropTypes::DragEventSource current_drag_event_source_; @@ -136,7 +133,6 @@ class ASH_EXPORT DragDropController DISALLOW_COPY_AND_ASSIGN(DragDropController); }; -} // namespace internal } // namespace ash #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ |