diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-24 05:42:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-24 05:42:46 +0000 |
| commit | 55f59335f5983f427d3cad623034a6803a38c1ee (patch) | |
| tree | 48deb522fa9431e2b939941f2741dd5f8145206d /ash/drag_drop/drag_drop_controller.h | |
| parent | 0d10f2cabb86eae1e0c71413b3c1b84ea77a75f2 (diff) | |
| download | chromium_src-55f59335f5983f427d3cad623034a6803a38c1ee.zip chromium_src-55f59335f5983f427d3cad623034a6803a38c1ee.tar.gz chromium_src-55f59335f5983f427d3cad623034a6803a38c1ee.tar.bz2 | |
Rename the aura_shell namespace to ash
http://crbug.com/108457
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/9033007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115748 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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index 3c830cb..1d895d6 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -18,7 +18,7 @@ namespace aura { class Window; } -namespace aura_shell { +namespace ash { namespace test { class DragDropControllerTest; @@ -58,7 +58,7 @@ class ASH_EXPORT DragDropController aura::TouchEvent* event) OVERRIDE; private: - friend class aura_shell::test::DragDropControllerTest; + friend class ash::test::DragDropControllerTest; // Helper method to reset everything. void Cleanup(); @@ -78,6 +78,6 @@ class ASH_EXPORT DragDropController }; } // namespace internal -} // namespace aura_shell +} // namespace ash #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ |