summaryrefslogtreecommitdiffstats
path: root/ash/wm/activation_controller.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-24 05:42:46 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-24 05:42:46 +0000
commit55f59335f5983f427d3cad623034a6803a38c1ee (patch)
tree48deb522fa9431e2b939941f2741dd5f8145206d /ash/wm/activation_controller.h
parent0d10f2cabb86eae1e0c71413b3c1b84ea77a75f2 (diff)
downloadchromium_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/wm/activation_controller.h')
-rw-r--r--ash/wm/activation_controller.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/activation_controller.h b/ash/wm/activation_controller.h
index 911db82..f7437d4 100644
--- a/ash/wm/activation_controller.h
+++ b/ash/wm/activation_controller.h
@@ -14,7 +14,7 @@
#include "ui/aura/window_observer.h"
#include "ash/ash_export.h"
-namespace aura_shell {
+namespace ash {
namespace internal {
// Exported for unit tests.
@@ -72,6 +72,6 @@ class ASH_EXPORT ActivationController
};
} // namespace internal
-} // namespace aura_shell
+} // namespace ash
#endif // ASH_WM_ACTIVATION_CONTROLLER_H_