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

69 files changed, 174 insertions, 174 deletions

diff --git a/ash/wm/activation_controller.cc b/ash/wm/activation_controller.cc
index faa9d92..a0409ee 100644
--- a/ash/wm/activation_controller.cc
+++ b/ash/wm/activation_controller.cc
@@ -13,7 +13,7 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 namespace {
 
@@ -184,4 +184,4 @@ aura::Window* ActivationController::GetTopmostWindowToActivate(
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
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_
diff --git a/ash/wm/activation_controller_unittest.cc b/ash/wm/activation_controller_unittest.cc
index 1d3ad2d..e19dc3b 100644
--- a/ash/wm/activation_controller_unittest.cc
+++ b/ash/wm/activation_controller_unittest.cc
@@ -20,7 +20,7 @@
 #endif
 #endif
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 typedef test::AuraShellTestBase ActivationControllerTest;
@@ -277,4 +277,4 @@ TEST_F(ActivationControllerTest, PreventFocusToNonActivatableWindow) {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/always_on_top_controller.cc b/ash/wm/always_on_top_controller.cc
index fcf160b..da0b2c6d 100644
--- a/ash/wm/always_on_top_controller.cc
+++ b/ash/wm/always_on_top_controller.cc
@@ -7,7 +7,7 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 AlwaysOnTopController::AlwaysOnTopController()
@@ -76,4 +76,4 @@ void AlwaysOnTopController::OnWindowDestroyed(aura::Window* window) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/always_on_top_controller.h b/ash/wm/always_on_top_controller.h
index f2bffe3..f74dc63 100644
--- a/ash/wm/always_on_top_controller.h
+++ b/ash/wm/always_on_top_controller.h
@@ -14,7 +14,7 @@ namespace aura {
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // AlwaysOnTopController puts window into proper containers based on its
@@ -48,7 +48,7 @@ class AlwaysOnTopController : public aura::WindowObserver {
   DISALLOW_COPY_AND_ASSIGN(AlwaysOnTopController);
 };
 
-}  // namepsace aura_shell
 }  // namepsace internal
+}  // namepsace ash
 
 #endif  // ASH_WM_ALWAYS_ON_TOP_CONTROLLER_H_
diff --git a/ash/wm/compact_layout_manager.cc b/ash/wm/compact_layout_manager.cc
index 7bd1fb2..a4a2847 100644
--- a/ash/wm/compact_layout_manager.cc
+++ b/ash/wm/compact_layout_manager.cc
@@ -11,7 +11,7 @@
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 CompactLayoutManager::CompactLayoutManager(views::Widget* status_area_widget)
@@ -82,4 +82,4 @@ void CompactLayoutManager::UpdateStatusAreaVisibility() {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/compact_layout_manager.h b/ash/wm/compact_layout_manager.h
index 0497b20..8785903 100644
--- a/ash/wm/compact_layout_manager.h
+++ b/ash/wm/compact_layout_manager.h
@@ -18,7 +18,7 @@ namespace views {
 class Widget;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // CompactLayoutManager is an alternate LayoutManager for the container that
@@ -60,7 +60,7 @@ class ASH_EXPORT CompactLayoutManager : public aura::LayoutManager,
   DISALLOW_COPY_AND_ASSIGN(CompactLayoutManager);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 }  // namespace internal
 
 #endif  // ASH_WM_COMPACT_LAYOUT_MANAGER_H_
diff --git a/ash/wm/compact_status_area_layout_manager.cc b/ash/wm/compact_status_area_layout_manager.cc
index 3bbaae3..fb6b5d5 100644
--- a/ash/wm/compact_status_area_layout_manager.cc
+++ b/ash/wm/compact_status_area_layout_manager.cc
@@ -13,7 +13,7 @@ namespace {
 const int kRightEdgePad = 3;
 }  // namespace
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -65,5 +65,5 @@ void CompactStatusAreaLayoutManager::LayoutStatusArea() {
   status_widget_->SetBounds(widget_bounds);
 }
 
-}  // internal
-}  // aura_shell
+}  // namespace internal
+}  // namespace ash
diff --git a/ash/wm/compact_status_area_layout_manager.h b/ash/wm/compact_status_area_layout_manager.h
index 336f02c..5ac7bb2 100644
--- a/ash/wm/compact_status_area_layout_manager.h
+++ b/ash/wm/compact_status_area_layout_manager.h
@@ -14,7 +14,7 @@ namespace views {
 class Widget;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // CompactStatusAreaLayoutManager places the status area in the top-right
@@ -43,6 +43,6 @@ class CompactStatusAreaLayoutManager : public aura::LayoutManager {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_COMPACT_STATUS_AREA_LAYOUT_MANAGER_H_
diff --git a/ash/wm/default_container_event_filter.cc b/ash/wm/default_container_event_filter.cc
index b671235..241c1af 100644
--- a/ash/wm/default_container_event_filter.cc
+++ b/ash/wm/default_container_event_filter.cc
@@ -18,9 +18,9 @@ namespace {
 void WindowHoverChanged(aura::Window* window, bool hovered) {
   if (!window)
     return;
-  aura_shell::WindowFrame* window_frame =
-      static_cast<aura_shell::WindowFrame*>(
-          window->GetProperty(aura_shell::kWindowFrameKey));
+  ash::WindowFrame* window_frame =
+      static_cast<ash::WindowFrame*>(
+          window->GetProperty(ash::kWindowFrameKey));
   if (!window_frame)
     return;
   window_frame->OnWindowHoverChanged(hovered);
@@ -28,7 +28,7 @@ void WindowHoverChanged(aura::Window* window, bool hovered) {
 
 }  // namespace
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 DefaultContainerEventFilter::DefaultContainerEventFilter(aura::Window* owner)
@@ -127,5 +127,5 @@ void DefaultContainerEventFilter::UpdateHoveredWindow(
   WindowHoverChanged(hovered_window_, true);
 }
 
-}  // internal
-}  // aura_shell
+}  // namespace internal
+}  // namespace ash
diff --git a/ash/wm/default_container_event_filter.h b/ash/wm/default_container_event_filter.h
index 992515d3..55baf01 100644
--- a/ash/wm/default_container_event_filter.h
+++ b/ash/wm/default_container_event_filter.h
@@ -13,7 +13,7 @@ class MouseEvent;
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class DefaultContainerEventFilter : public ToplevelWindowEventFilter {
@@ -50,6 +50,6 @@ class DefaultContainerEventFilter : public ToplevelWindowEventFilter {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  //  ASH_WM_DEFAULT_CONTAINER_EVENT_FILTER_H_
diff --git a/ash/wm/default_container_layout_manager.cc b/ash/wm/default_container_layout_manager.cc
index a928ae4..83360c0 100644
--- a/ash/wm/default_container_layout_manager.cc
+++ b/ash/wm/default_container_layout_manager.cc
@@ -19,7 +19,7 @@
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/native_widget_aura.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -107,7 +107,7 @@ void DefaultContainerLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
 
   Workspace* workspace = workspace_manager_->GetActiveWorkspace();
   if (workspace) {
-    aura::Window* active = aura_shell::GetActiveWindow();
+    aura::Window* active = ash::GetActiveWindow();
     // Active window may not be in the default container layer.
     if (!workspace->Contains(active))
       active = NULL;
@@ -187,4 +187,4 @@ void DefaultContainerLayoutManager::SetChildBounds(
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/default_container_layout_manager.h b/ash/wm/default_container_layout_manager.h
index 51b7bbdf..b61866d 100644
--- a/ash/wm/default_container_layout_manager.h
+++ b/ash/wm/default_container_layout_manager.h
@@ -21,7 +21,7 @@ namespace gfx {
 class Rect;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class ShowStateController;
@@ -72,6 +72,6 @@ class ASH_EXPORT DefaultContainerLayoutManager
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_DEFAULT_CONTAINER_LAYOUT_MANAGER_H_
diff --git a/ash/wm/default_container_layout_manager_unittest.cc b/ash/wm/default_container_layout_manager_unittest.cc
index e722e32..4e7e067 100644
--- a/ash/wm/default_container_layout_manager_unittest.cc
+++ b/ash/wm/default_container_layout_manager_unittest.cc
@@ -18,13 +18,13 @@
 #include "ui/base/ui_base_types.h"
 #include "ui/views/widget/native_widget_aura.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 namespace {
 
 using views::Widget;
-using aura_shell::internal::DefaultContainerLayoutManager;
+using ash::internal::DefaultContainerLayoutManager;
 
 class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
  public:
@@ -37,7 +37,7 @@ class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
     container_.reset(
         CreateTestWindow(gfx::Rect(0, 0, 500, 400), root_window));
     workspace_controller_.reset(
-        new aura_shell::internal::WorkspaceController(container_.get()));
+        new ash::internal::WorkspaceController(container_.get()));
     layout_manager_ = new DefaultContainerLayoutManager(
         workspace_controller_->workspace_manager());
     container_->SetLayoutManager(layout_manager_);
@@ -71,15 +71,15 @@ class DefaultContainerLayoutManagerTest : public aura::test::AuraTestBase {
   }
 
  protected:
-  aura_shell::internal::WorkspaceManager* workspace_manager() {
+  ash::internal::WorkspaceManager* workspace_manager() {
     return workspace_controller_->workspace_manager();
   }
 
  private:
   scoped_ptr<aura::Window> container_;
-  scoped_ptr<aura_shell::internal::WorkspaceController> workspace_controller_;
+  scoped_ptr<ash::internal::WorkspaceController> workspace_controller_;
   // LayoutManager is owned by |container|.
-  aura_shell::internal::DefaultContainerLayoutManager* layout_manager_;
+  ash::internal::DefaultContainerLayoutManager* layout_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultContainerLayoutManagerTest);
@@ -338,4 +338,4 @@ TEST_F(DefaultContainerLayoutManagerTest, MaximizeAfterRootWindowResize) {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/image_grid.cc b/ash/wm/image_grid.cc
index 67b8326..89d3054 100644
--- a/ash/wm/image_grid.cc
+++ b/ash/wm/image_grid.cc
@@ -15,7 +15,7 @@
 using std::max;
 using std::min;
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 gfx::Rect ImageGrid::TestAPI::GetTransformedLayerBounds(
@@ -243,4 +243,4 @@ void ImageGrid::InitImage(const gfx::Image* image,
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/image_grid.h b/ash/wm/image_grid.h
index 38ff5a8..0035fa6 100644
--- a/ash/wm/image_grid.h
+++ b/ash/wm/image_grid.h
@@ -19,7 +19,7 @@ namespace gfx {
 class Image;
 }  // namespace gfx
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // An ImageGrid is a 3x3 array of ui::Layers, each containing an image.
@@ -207,6 +207,6 @@ class ASH_EXPORT ImageGrid {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_IMAGE_GRID_H_
diff --git a/ash/wm/image_grid_unittest.cc b/ash/wm/image_grid_unittest.cc
index 3bb8714..f2fe71b 100644
--- a/ash/wm/image_grid_unittest.cc
+++ b/ash/wm/image_grid_unittest.cc
@@ -8,9 +8,9 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 
-using aura_shell::internal::ImageGrid;
+using ash::internal::ImageGrid;
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 namespace {
@@ -24,7 +24,7 @@ gfx::Image* CreateImage(const gfx::Size& size) {
 
 }  // namespace
 
-typedef aura_shell::test::AuraShellTestBase ImageGridTest;
+typedef ash::test::AuraShellTestBase ImageGridTest;
 
 // Test that an ImageGrid's layers are transformed correctly when SetSize() is
 // called.
@@ -269,4 +269,4 @@ TEST_F(ImageGridTest, TooSmall) {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/modal_container_layout_manager.cc b/ash/wm/modal_container_layout_manager.cc
index 7255a5e..589305e 100644
--- a/ash/wm/modal_container_layout_manager.cc
+++ b/ash/wm/modal_container_layout_manager.cc
@@ -18,7 +18,7 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 namespace {
@@ -146,7 +146,7 @@ void ModalContainerLayoutManager::RemoveModalWindow(aura::Window* window) {
   if (modal_windows_.empty())
     HideModalScreen();
   else
-    aura_shell::ActivateWindow(modal_window());
+    ash::ActivateWindow(modal_window());
 }
 
 void ModalContainerLayoutManager::CreateModalScreen() {
@@ -187,4 +187,4 @@ void ModalContainerLayoutManager::HideModalScreen() {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/modal_container_layout_manager.h b/ash/wm/modal_container_layout_manager.h
index 6a67362..2ee1e85 100644
--- a/ash/wm/modal_container_layout_manager.h
+++ b/ash/wm/modal_container_layout_manager.h
@@ -28,7 +28,7 @@ namespace views {
 class Widget;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // LayoutManager for the modal window container.
@@ -97,6 +97,6 @@ class ASH_EXPORT ModalContainerLayoutManager
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_MODAL_CONTAINER_LAYOUT_MANAGER_H_
diff --git a/ash/wm/modal_container_layout_manager_unittest.cc b/ash/wm/modal_container_layout_manager_unittest.cc
index 7953004..a9901ad 100644
--- a/ash/wm/modal_container_layout_manager_unittest.cc
+++ b/ash/wm/modal_container_layout_manager_unittest.cc
@@ -15,19 +15,19 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 namespace {
 
 aura::Window* GetModalContainer() {
   return Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_ModalContainer);
+      ash::internal::kShellWindowId_ModalContainer);
 }
 
 aura::Window* GetDefaultContainer() {
   return Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_DefaultContainer);
+      ash::internal::kShellWindowId_DefaultContainer);
 }
 
 class TestWindow : public views::WidgetDelegateView {
@@ -171,4 +171,4 @@ TEST_F(ModalContainerLayoutManagerTest, CanActivateAfterEndModalSession) {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/modality_event_filter.cc b/ash/wm/modality_event_filter.cc
index e44c86e..1b8128d 100644
--- a/ash/wm/modality_event_filter.cc
+++ b/ash/wm/modality_event_filter.cc
@@ -7,7 +7,7 @@
 #include "ash/wm/modality_event_filter_delegate.h"
 #include "ui/aura/event.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 ModalityEventFilter::ModalityEventFilter(aura::Window* container,
@@ -37,4 +37,4 @@ ui::TouchStatus ModalityEventFilter::PreHandleTouchEvent(
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/modality_event_filter.h b/ash/wm/modality_event_filter.h
index 73d55f9..0005f382 100644
--- a/ash/wm/modality_event_filter.h
+++ b/ash/wm/modality_event_filter.h
@@ -10,7 +10,7 @@
 #include "ui/aura/event_filter.h"
 #include "ash/ash_export.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class ModalityEventFilterDelegate;
@@ -37,6 +37,6 @@ class ASH_EXPORT ModalityEventFilter : public aura::EventFilter {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_MODALITY_EVENT_FILTER_H_
diff --git a/ash/wm/modality_event_filter_delegate.h b/ash/wm/modality_event_filter_delegate.h
index 57d9420..15c9fc9 100644
--- a/ash/wm/modality_event_filter_delegate.h
+++ b/ash/wm/modality_event_filter_delegate.h
@@ -12,7 +12,7 @@ namespace aura {
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class ASH_EXPORT ModalityEventFilterDelegate {
@@ -22,6 +22,6 @@ class ASH_EXPORT ModalityEventFilterDelegate {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_MODALITY_EVENT_FILTER_DELEGATE_H_
diff --git a/ash/wm/property_util.cc b/ash/wm/property_util.cc
index ea03978..eaac484 100644
--- a/ash/wm/property_util.cc
+++ b/ash/wm/property_util.cc
@@ -9,7 +9,7 @@
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 
-namespace aura_shell {
+namespace ash {
 
 void SetRestoreBounds(aura::Window* window, const gfx::Rect& bounds) {
   delete GetRestoreBounds(window);
diff --git a/ash/wm/property_util.h b/ash/wm/property_util.h
index 0784045..916a24a 100644
--- a/ash/wm/property_util.h
+++ b/ash/wm/property_util.h
@@ -14,7 +14,7 @@ namespace gfx {
 class Rect;
 }
 
-namespace aura_shell {
+namespace ash {
 
 // Sets the restore bounds property on |window|. Deletes existing bounds value
 // if exists.
diff --git a/ash/wm/root_window_event_filter.cc b/ash/wm/root_window_event_filter.cc
index 7e6bdaf..6ccffe3 100644
--- a/ash/wm/root_window_event_filter.cc
+++ b/ash/wm/root_window_event_filter.cc
@@ -13,7 +13,7 @@
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // Returns the default cursor for a window component.
@@ -165,4 +165,4 @@ ui::TouchStatus RootWindowEventFilter::FilterTouchEvent(
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/root_window_event_filter.h b/ash/wm/root_window_event_filter.h
index 97bbe68..d2d3b6c 100644
--- a/ash/wm/root_window_event_filter.h
+++ b/ash/wm/root_window_event_filter.h
@@ -12,7 +12,7 @@
 #include "ui/aura/event_filter.h"
 #include "ash/ash_export.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // RootWindowEventFilter gets all root window events first and can provide
@@ -64,6 +64,6 @@ class ASH_EXPORT RootWindowEventFilter : public aura::EventFilter {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_ROOT_WINDOW_EVENT_FILTER_H_
diff --git a/ash/wm/root_window_event_filter_unittest.cc b/ash/wm/root_window_event_filter_unittest.cc
index 708a9b8..f664e3f 100644
--- a/ash/wm/root_window_event_filter_unittest.cc
+++ b/ash/wm/root_window_event_filter_unittest.cc
@@ -20,7 +20,7 @@
 #include "ui/base/hit_test.h"
 #include "ui/gfx/screen.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 class RootWindowEventFilterTest : public aura::test::AuraTestBase {
@@ -146,7 +146,7 @@ TEST_F(RootWindowEventFilterTest, ActivateOnMouse) {
   d2.Clear();
 
   // Activate window1.
-  aura_shell::ActivateWindow(w1.get());
+  ash::ActivateWindow(w1.get());
   EXPECT_TRUE(IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_manager->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
@@ -221,7 +221,7 @@ TEST_F(RootWindowEventFilterTest, ActivateOnTouch) {
   d2.Clear();
 
   // Activate window1.
-  aura_shell::ActivateWindow(w1.get());
+  ash::ActivateWindow(w1.get());
   EXPECT_TRUE(IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_manager->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
@@ -383,7 +383,7 @@ TEST_F(RootWindowEventFilterTest, AdditionalFilters) {
   // Creates a window and make it active
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindow(
       SK_ColorWHITE, -1, gfx::Rect(0, 0, 100, 100), NULL));
-  aura_shell::ActivateWindow(w1.get());
+  ash::ActivateWindow(w1.get());
 
   // Creates two addition filters
   scoped_ptr<aura::test::TestEventFilter> f1(
@@ -448,4 +448,4 @@ TEST_F(RootWindowEventFilterTest, AdditionalFilters) {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc
index 58fac12..92ae6e9 100644
--- a/ash/wm/root_window_layout_manager.cc
+++ b/ash/wm/root_window_layout_manager.cc
@@ -7,7 +7,7 @@
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -55,4 +55,4 @@ void RootWindowLayoutManager::SetChildBounds(
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/root_window_layout_manager.h b/ash/wm/root_window_layout_manager.h
index 91d9717..79ac330 100644
--- a/ash/wm/root_window_layout_manager.h
+++ b/ash/wm/root_window_layout_manager.h
@@ -20,7 +20,7 @@ namespace views {
 class Widget;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // A layout manager for the root window.
@@ -53,6 +53,6 @@ class RootWindowLayoutManager : public aura::LayoutManager {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_
diff --git a/ash/wm/shadow.cc b/ash/wm/shadow.cc
index c8bb543..e25a8e4 100644
--- a/ash/wm/shadow.cc
+++ b/ash/wm/shadow.cc
@@ -8,7 +8,7 @@
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 Shadow::Shadow() {
@@ -51,4 +51,4 @@ void Shadow::SetContentBounds(const gfx::Rect& content_bounds) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/shadow.h b/ash/wm/shadow.h
index 4f82b82..d16021f 100644
--- a/ash/wm/shadow.h
+++ b/ash/wm/shadow.h
@@ -15,7 +15,7 @@ namespace ui {
 class Layer;
 }  // namespace ui
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class ImageGrid;
@@ -49,6 +49,6 @@ class ASH_EXPORT Shadow {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_SHADOW_H_
diff --git a/ash/wm/shadow_controller.cc b/ash/wm/shadow_controller.cc
index b39d619..539596f 100644
--- a/ash/wm/shadow_controller.cc
+++ b/ash/wm/shadow_controller.cc
@@ -17,7 +17,7 @@
 
 using std::make_pair;
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 namespace {
@@ -114,4 +114,4 @@ void ShadowController::CreateShadowForWindow(aura::Window* window) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/shadow_controller.h b/ash/wm/shadow_controller.h
index 403a658..0613dd7 100644
--- a/ash/wm/shadow_controller.h
+++ b/ash/wm/shadow_controller.h
@@ -22,7 +22,7 @@ namespace gfx {
 class Rect;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class Shadow;
@@ -83,7 +83,7 @@ public:
   DISALLOW_COPY_AND_ASSIGN(ShadowController);
 };
 
-}  // namepsace aura_shell
 }  // namepsace internal
+}  // namepsace ash
 
 #endif  // ASH_WM_SHADOW_CONTROLLER_H_
diff --git a/ash/wm/shadow_controller_unittest.cc b/ash/wm/shadow_controller_unittest.cc
index 9bc581c..e67dc08 100644
--- a/ash/wm/shadow_controller_unittest.cc
+++ b/ash/wm/shadow_controller_unittest.cc
@@ -17,10 +17,10 @@
 #include "ui/aura/window.h"
 #include "ui/gfx/compositor/layer.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
-typedef aura_shell::test::AuraShellTestBase ShadowControllerTest;
+typedef ash::test::AuraShellTestBase ShadowControllerTest;
 
 // Tests that various methods in Window update the Shadow object as expected.
 TEST_F(ShadowControllerTest, Shadow) {
@@ -32,7 +32,7 @@ TEST_F(ShadowControllerTest, Shadow) {
   // We should create the shadow before the window is visible (the shadow's
   // layer won't get drawn yet since it's a child of the window's layer).
   internal::ShadowController::TestApi api(
-      aura_shell::Shell::GetInstance()->shadow_controller());
+      ash::Shell::GetInstance()->shadow_controller());
   const internal::Shadow* shadow = api.GetShadowForWindow(window.get());
   ASSERT_TRUE(shadow != NULL);
   EXPECT_TRUE(shadow->layer()->visible());
@@ -74,7 +74,7 @@ TEST_F(ShadowControllerTest, ShadowBounds) {
   // remain at the origin, since it's a child of the window's layer).
   internal::SetShadowType(window.get(), internal::SHADOW_TYPE_RECTANGULAR);
   internal::ShadowController::TestApi api(
-      aura_shell::Shell::GetInstance()->shadow_controller());
+      ash::Shell::GetInstance()->shadow_controller());
   const internal::Shadow* shadow = api.GetShadowForWindow(window.get());
   ASSERT_TRUE(shadow != NULL);
   EXPECT_EQ(gfx::Rect(kOldBounds.size()).ToString(),
@@ -88,4 +88,4 @@ TEST_F(ShadowControllerTest, ShadowBounds) {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/shadow_types.cc b/ash/wm/shadow_types.cc
index 16ad02f..346a1e8 100644
--- a/ash/wm/shadow_types.cc
+++ b/ash/wm/shadow_types.cc
@@ -7,7 +7,7 @@
 #include "ash/wm/window_properties.h"
 #include "ui/aura/window.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 void SetShadowType(aura::Window* window, ShadowType shadow_type) {
@@ -19,4 +19,4 @@ ShadowType GetShadowType(aura::Window* window) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/shadow_types.h b/ash/wm/shadow_types.h
index 59d7252..bf30037 100644
--- a/ash/wm/shadow_types.h
+++ b/ash/wm/shadow_types.h
@@ -12,7 +12,7 @@ namespace aura {
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // Different types of drop shadows that can be drawn under a window by the
@@ -28,6 +28,6 @@ ASH_EXPORT void SetShadowType(aura::Window* window,
 ASH_EXPORT ShadowType GetShadowType(aura::Window* window);
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_SHADOW_TYPES_H_
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
index 5c2f349..87b9d6c 100644
--- a/ash/wm/shelf_layout_manager.cc
+++ b/ash/wm/shelf_layout_manager.cc
@@ -13,7 +13,7 @@
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 namespace {
@@ -155,5 +155,5 @@ void ShelfLayoutManager::OnLayerAnimationEnded(
       target_bounds.work_area_insets);
 }
 
-}  // internal
-}  // aura_shell
+}  // namespace internal
+}  // namespace ash
diff --git a/ash/wm/shelf_layout_manager.h b/ash/wm/shelf_layout_manager.h
index 0480313..0bdf8c5 100644
--- a/ash/wm/shelf_layout_manager.h
+++ b/ash/wm/shelf_layout_manager.h
@@ -18,7 +18,7 @@ namespace views {
 class Widget;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // ShelfLayoutManager is the layout manager responsible for the launcher and
@@ -106,6 +106,6 @@ class ASH_EXPORT ShelfLayoutManager : public aura::LayoutManager,
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_SHELF_LAYOUT_MANAGER_H_
diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc
index 01239c8..d4e80c6 100644
--- a/ash/wm/shelf_layout_manager_unittest.cc
+++ b/ash/wm/shelf_layout_manager_unittest.cc
@@ -16,7 +16,7 @@
 #include "ui/gfx/compositor/layer.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 namespace {
@@ -29,14 +29,14 @@ void StepWidgetLayerAnimatorToEnd(views::Widget* widget) {
 }
 
 ShelfLayoutManager* GetShelfLayoutManager() {
-  aura::Window* window = aura_shell::Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LauncherContainer);
+  aura::Window* window = ash::Shell::GetInstance()->GetContainer(
+      ash::internal::kShellWindowId_LauncherContainer);
   return static_cast<ShelfLayoutManager*>(window->layout_manager());
 }
 
 }  // namespace
 
-typedef aura_shell::test::AuraShellTestBase ShelfLayoutManagerTest;
+typedef ash::test::AuraShellTestBase ShelfLayoutManagerTest;
 
 // Makes sure SetVisible updates work area and widget appropriately.
 TEST_F(ShelfLayoutManagerTest, SetVisible) {
@@ -131,4 +131,4 @@ TEST_F(ShelfLayoutManagerTest, LauncherUpdatedWhenStatusAreaChangesSize) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/show_state_controller.cc b/ash/wm/show_state_controller.cc
index 149ead2..9b670c7 100644
--- a/ash/wm/show_state_controller.cc
+++ b/ash/wm/show_state_controller.cc
@@ -11,7 +11,7 @@
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 ShowStateController::ShowStateController(
@@ -44,4 +44,4 @@ void ShowStateController::OnWindowPropertyChanged(aura::Window* window,
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/show_state_controller.h b/ash/wm/show_state_controller.h
index a2b3244..5b3191f5 100644
--- a/ash/wm/show_state_controller.h
+++ b/ash/wm/show_state_controller.h
@@ -14,7 +14,7 @@ namespace aura {
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class WorkspaceManager;
@@ -38,7 +38,7 @@ public:
   DISALLOW_COPY_AND_ASSIGN(ShowStateController);
 };
 
-}  // namepsace aura_shell
 }  // namepsace internal
+}  // namepsace ash
 
 #endif  // ASH_WM_SHOW_STATE_CONTROLLER_H_
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index 40d8f84..6433bb1 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -11,7 +11,7 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 namespace {
 
@@ -91,4 +91,4 @@ aura::Window* StackingController::GetModalContainer(
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/stacking_controller.h b/ash/wm/stacking_controller.h
index 79fcaed..47813821 100644
--- a/ash/wm/stacking_controller.h
+++ b/ash/wm/stacking_controller.h
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/stacking_client.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class AlwaysOnTopController;
@@ -38,6 +38,6 @@ class StackingController : public aura::client::StackingClient {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_STACKING_CONTROLLER_H_
diff --git a/ash/wm/status_area_layout_manager.cc b/ash/wm/status_area_layout_manager.cc
index e933f75..05f6fde 100644
--- a/ash/wm/status_area_layout_manager.cc
+++ b/ash/wm/status_area_layout_manager.cc
@@ -7,7 +7,7 @@
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/auto_reset.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -58,5 +58,5 @@ void StatusAreaLayoutManager::LayoutStatusArea() {
   shelf_->LayoutShelf();
 }
 
-}  // internal
-}  // aura_shell
+}  // namespace internal
+}  // namespace ash
diff --git a/ash/wm/status_area_layout_manager.h b/ash/wm/status_area_layout_manager.h
index 2cc3655..8554565 100644
--- a/ash/wm/status_area_layout_manager.h
+++ b/ash/wm/status_area_layout_manager.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "ui/aura/layout_manager.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class ShelfLayoutManager;
@@ -47,6 +47,6 @@ class StatusAreaLayoutManager : public aura::LayoutManager {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_STATUS_AREA_LAYOUT_MANAGER_H_
diff --git a/ash/wm/toplevel_frame_view.cc b/ash/wm/toplevel_frame_view.cc
index 147ba05..89fe70f 100644
--- a/ash/wm/toplevel_frame_view.cc
+++ b/ash/wm/toplevel_frame_view.cc
@@ -14,7 +14,7 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 namespace {
@@ -484,4 +484,4 @@ gfx::NativeCursor ToplevelFrameView::GetCursor(const views::MouseEvent& event) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/toplevel_frame_view.h b/ash/wm/toplevel_frame_view.h
index 2a304cb..5e78769 100644
--- a/ash/wm/toplevel_frame_view.h
+++ b/ash/wm/toplevel_frame_view.h
@@ -10,7 +10,7 @@
 #include "ui/views/controls/button/button.h"
 #include "ui/views/window/non_client_view.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class FrameComponent;
@@ -80,6 +80,6 @@ class ASH_EXPORT ToplevelFrameView : public views::NonClientFrameView {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // #ifndef ASH_WM_TOPLEVEL_FRAME_VIEW_H_
diff --git a/ash/wm/toplevel_layout_manager.cc b/ash/wm/toplevel_layout_manager.cc
index 9f7601a..09a5ae1 100644
--- a/ash/wm/toplevel_layout_manager.cc
+++ b/ash/wm/toplevel_layout_manager.cc
@@ -11,7 +11,7 @@
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/screen.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 ToplevelLayoutManager::ToplevelLayoutManager() : shelf_(NULL) {
@@ -74,4 +74,4 @@ void ToplevelLayoutManager::UpdateShelfVisibility() {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/toplevel_layout_manager.h b/ash/wm/toplevel_layout_manager.h
index f7138ad..27aa7ac 100644
--- a/ash/wm/toplevel_layout_manager.h
+++ b/ash/wm/toplevel_layout_manager.h
@@ -14,7 +14,7 @@
 #include "ui/aura/window_observer.h"
 #include "ash/ash_export.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class ShelfLayoutManager;
@@ -61,7 +61,7 @@ class ASH_EXPORT ToplevelLayoutManager : public aura::LayoutManager,
   DISALLOW_COPY_AND_ASSIGN(ToplevelLayoutManager);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 }  // namespace internal
 
 #endif  // ASH_WM_TOPLEVEL_LAYOUT_MANAGER_H_
diff --git a/ash/wm/toplevel_layout_manager_unittest.cc b/ash/wm/toplevel_layout_manager_unittest.cc
index a43b963..8f150ff 100644
--- a/ash/wm/toplevel_layout_manager_unittest.cc
+++ b/ash/wm/toplevel_layout_manager_unittest.cc
@@ -13,7 +13,7 @@
 #include "ui/base/ui_base_types.h"
 #include "ui/aura/window.h"
 
-namespace aura_shell {
+namespace ash {
 
 namespace {
 
@@ -77,4 +77,4 @@ TEST_F(ToplevelLayoutManagerTest, Fullscreen) {
   EXPECT_EQ(bounds, window->bounds());
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/toplevel_window_event_filter.cc b/ash/wm/toplevel_window_event_filter.cc
index f3b5e6c..c4d0695 100644
--- a/ash/wm/toplevel_window_event_filter.cc
+++ b/ash/wm/toplevel_window_event_filter.cc
@@ -14,7 +14,7 @@
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 
-namespace aura_shell {
+namespace ash {
 
 namespace {
 
diff --git a/ash/wm/toplevel_window_event_filter.h b/ash/wm/toplevel_window_event_filter.h
index 1217d1b..b548289 100644
--- a/ash/wm/toplevel_window_event_filter.h
+++ b/ash/wm/toplevel_window_event_filter.h
@@ -20,7 +20,7 @@ class MouseEvent;
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 
 class ASH_EXPORT ToplevelWindowEventFilter : public aura::EventFilter {
  public:
diff --git a/ash/wm/toplevel_window_event_filter_unittest.cc b/ash/wm/toplevel_window_event_filter_unittest.cc
index 220ceaf..fb86a15 100644
--- a/ash/wm/toplevel_window_event_filter_unittest.cc
+++ b/ash/wm/toplevel_window_event_filter_unittest.cc
@@ -23,7 +23,7 @@
 #endif
 
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 namespace {
diff --git a/ash/wm/window_frame.cc b/ash/wm/window_frame.cc
index 049e4bb..4f46571 100644
--- a/ash/wm/window_frame.cc
+++ b/ash/wm/window_frame.cc
@@ -4,7 +4,7 @@
 
 #include "ash/wm/window_frame.h"
 
-namespace aura_shell {
+namespace ash {
 
 const char* const kWindowFrameKey = "WindowFrameKey";
 
diff --git a/ash/wm/window_frame.h b/ash/wm/window_frame.h
index e359145..228e1fd 100644
--- a/ash/wm/window_frame.h
+++ b/ash/wm/window_frame.h
@@ -8,7 +8,7 @@
 
 #include "ash/ash_export.h"
 
-namespace aura_shell {
+namespace ash {
 
 // aura::Window property name for a pointer to the WindowFrame interface.
 ASH_EXPORT extern const char* const kWindowFrameKey;
@@ -23,6 +23,6 @@ class ASH_EXPORT WindowFrame {
   virtual void OnWindowHoverChanged(bool hovered) = 0;
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_WINDOW_FRAME_H_
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index 31947bd..c1c33f0 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -4,7 +4,7 @@
 
 #include "ash/wm/window_properties.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // Alphabetical sort.
@@ -14,4 +14,4 @@ const char kShadowTypeKey[] = "ShadowType";
 // Alphabetical sort.
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h
index 3392ed1..a090c35 100644
--- a/ash/wm/window_properties.h
+++ b/ash/wm/window_properties.h
@@ -6,7 +6,7 @@
 #define ASH_WM_WINDOW_PROPERTIES_H_
 #pragma once
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // Shell-specific window property keys.
@@ -20,6 +20,6 @@ extern const char kShadowTypeKey[];
 // Alphabetical sort.
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_WINDOW_PROPERTIES_H_
diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc
index f22f1d1..37104d7 100644
--- a/ash/wm/window_util.cc
+++ b/ash/wm/window_util.cc
@@ -13,7 +13,7 @@
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/screen.h"
 
-namespace aura_shell {
+namespace ash {
 
 bool IsWindowMaximized(aura::Window* window) {
   return window->GetIntProperty(aura::client::kShowStateKey) ==
@@ -76,4 +76,4 @@ bool HasFullscreenWindow(const WindowSet& windows) {
   return false;
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/window_util.h b/ash/wm/window_util.h
index bba1c26..e96591f 100644
--- a/ash/wm/window_util.h
+++ b/ash/wm/window_util.h
@@ -14,7 +14,7 @@ namespace aura {
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 
 // TODO(jamescook): Put all these functions in namespace window_util.
 
@@ -41,6 +41,6 @@ ASH_EXPORT void UpdateBoundsFromShowState(aura::Window* window);
 typedef std::set<aura::Window*> WindowSet;
 ASH_EXPORT bool HasFullscreenWindow(const WindowSet& windows);
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_WINDOW_UTIL_H_
diff --git a/ash/wm/workspace/workspace.cc b/ash/wm/workspace/workspace.cc
index 57f6ec3d..cf64897 100644
--- a/ash/wm/workspace/workspace.cc
+++ b/ash/wm/workspace/workspace.cc
@@ -31,7 +31,7 @@ size_t g_max_windows_per_workspace = 2;
 // or the current bounds of the window of no animation is currently
 // in progress.
 gfx::Rect GetLayoutBounds(aura::Window* window) {
-  const gfx::Rect* restore_bounds = aura_shell::GetRestoreBounds(window);
+  const gfx::Rect* restore_bounds = ash::GetRestoreBounds(window);
   return restore_bounds ? *restore_bounds : window->GetTargetBounds();
 }
 
@@ -43,7 +43,7 @@ int GetLayoutWidth(aura::Window* window) {
 
 }  // namespace
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 Workspace::Workspace(WorkspaceManager* manager)
@@ -96,7 +96,7 @@ bool Workspace::Contains(aura::Window* window) const {
 
 aura::Window* Workspace::FindRotateWindowForLocation(
     const gfx::Point& position) {
-  aura::Window* active = aura_shell::GetActiveWindow();
+  aura::Window* active = ash::GetActiveWindow();
   if (GetTotalWindowsWidth() < bounds_.width()) {
     // If all windows fit to the width of the workspace, it returns the
     // window which contains |position|'s x coordinate.
@@ -283,4 +283,4 @@ size_t Workspace::SetMaxWindowsCount(size_t max) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/workspace/workspace.h b/ash/wm/workspace/workspace.h
index 4256fab..cfae27b 100644
--- a/ash/wm/workspace/workspace.h
+++ b/ash/wm/workspace/workspace.h
@@ -16,7 +16,7 @@ namespace aura {
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class WorkspaceManager;
@@ -135,6 +135,6 @@ class ASH_EXPORT Workspace {
 typedef std::vector<Workspace*> Workspaces;
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_H_
diff --git a/ash/wm/workspace/workspace_manager.cc b/ash/wm/workspace/workspace_manager.cc
index 06d6994..754d90d 100644
--- a/ash/wm/workspace/workspace_manager.cc
+++ b/ash/wm/workspace/workspace_manager.cc
@@ -30,7 +30,7 @@ const float kMinOverviewScale = 0.3f;
 
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -273,4 +273,4 @@ void WorkspaceManager::UpdateContentsView() {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/workspace/workspace_manager.h b/ash/wm/workspace/workspace_manager.h
index 69711c9..99560e9 100644
--- a/ash/wm/workspace/workspace_manager.h
+++ b/ash/wm/workspace/workspace_manager.h
@@ -23,7 +23,7 @@ class Point;
 class Rect;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 class Workspace;
 class WorkspaceObserver;
@@ -130,6 +130,6 @@ class ASH_EXPORT WorkspaceManager {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_MANAGER_H_
diff --git a/ash/wm/workspace/workspace_manager_unittest.cc b/ash/wm/workspace/workspace_manager_unittest.cc
index 92062ca..51df194 100644
--- a/ash/wm/workspace/workspace_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_manager_unittest.cc
@@ -16,11 +16,11 @@
 #include "ui/base/ui_base_types.h"
 
 namespace {
-using aura_shell::internal::Workspace;
-using aura_shell::internal::WorkspaceManager;
+using ash::internal::Workspace;
+using ash::internal::WorkspaceManager;
 using aura::Window;
 
-class TestWorkspaceObserver : public aura_shell::internal::WorkspaceObserver {
+class TestWorkspaceObserver : public ash::internal::WorkspaceObserver {
  public:
   explicit TestWorkspaceObserver(WorkspaceManager* manager)
       : manager_(manager),
@@ -73,7 +73,7 @@ class TestWorkspaceObserver : public aura_shell::internal::WorkspaceObserver {
 
 }  // namespace
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class WorkspaceManagerTestBase : public aura::test::AuraTestBase {
@@ -564,4 +564,4 @@ TEST_F(WorkspaceTest, ContainsFullscreenWindow) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/workspace/workspace_observer.h b/ash/wm/workspace/workspace_observer.h
index 45439e3..c6e055b 100644
--- a/ash/wm/workspace/workspace_observer.h
+++ b/ash/wm/workspace/workspace_observer.h
@@ -12,7 +12,7 @@ namespace aura {
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 class Workspace;
 class WorkspaceManager;
@@ -35,6 +35,6 @@ class ASH_EXPORT WorkspaceObserver {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_WORKSPACE_OBSERVER_H_
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 9faafd8..7cfa2eb 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -16,7 +16,7 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 WorkspaceController::WorkspaceController(aura::Window* viewport)
@@ -68,7 +68,7 @@ void WorkspaceController::OnWindowPropertyChanged(aura::Window* window,
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// WorkspaceController, aura_shell::internal::WorkspaceObserver overrides:
+// WorkspaceController, ash::internal::WorkspaceObserver overrides:
 
 void WorkspaceController::WindowMoved(WorkspaceManager* manager,
                                       aura::Window* source,
@@ -95,7 +95,7 @@ void WorkspaceController::ActiveWorkspaceChanged(WorkspaceManager* manager,
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// WorkspaceController, aura_shell::LauncherModelObserver overrides:
+// WorkspaceController, ash::LauncherModelObserver overrides:
 
 void WorkspaceController::LauncherItemAdded(int index) {
 }
@@ -124,4 +124,4 @@ void WorkspaceController::LauncherItemImagesChanged(int index) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
index 771f5b9..d1304f4 100644
--- a/ash/wm/workspace_controller.h
+++ b/ash/wm/workspace_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_AURA_SHELL_WORKSPACE_CONTROLLER_H_
-#define UI_AURA_SHELL_WORKSPACE_CONTROLLER_H_
+#ifndef ASH_WM_WORKSPACE_CONTROLLER_H_
+#define ASH_WM_WORKSPACE_CONTROLLER_H_
 #pragma once
 
 #include "ash/launcher/launcher_model_observer.h"
@@ -22,7 +22,7 @@ namespace gfx {
 class Size;
 }
 
-namespace aura_shell {
+namespace ash {
 class LauncherModel;
 
 namespace internal {
@@ -35,8 +35,8 @@ class WorkspaceManager;
 class ASH_EXPORT WorkspaceController :
       public aura::RootWindowObserver,
       public aura::WindowObserver,
-      public aura_shell::internal::WorkspaceObserver,
-      public aura_shell::LauncherModelObserver {
+      public ash::internal::WorkspaceObserver,
+      public ash::LauncherModelObserver {
  public:
   explicit WorkspaceController(aura::Window* workspace_viewport);
   virtual ~WorkspaceController();
@@ -86,6 +86,6 @@ class ASH_EXPORT WorkspaceController :
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
-#endif  // UI_AURA_SHELL_WORKSPACE_CONTROLLER_H_
+#endif  // ASH_WM_WORKSPACE_CONTROLLER_H_
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc
index e470a0f..5438a6ff 100644
--- a/ash/wm/workspace_controller_unittest.cc
+++ b/ash/wm/workspace_controller_unittest.cc
@@ -13,7 +13,7 @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 using aura::Window;
@@ -29,7 +29,7 @@ class WorkspaceControllerTest : public aura::test::AuraTestBase {
     // Activatable windows need to be in a container the ActivationController
     // recognizes.
     contents_view_->set_id(
-        aura_shell::internal::kShellWindowId_DefaultContainer);
+        ash::internal::kShellWindowId_DefaultContainer);
     activation_controller_.reset(new ActivationController);
     activation_controller_->set_default_container_for_test(contents_view_);
     controller_.reset(new WorkspaceController(contents_view_));
@@ -81,7 +81,7 @@ TEST_F(WorkspaceControllerTest, Overview) {
   EXPECT_TRUE(ws2->AddWindowAfter(w2.get(), NULL));
 
   // Activating a window switches the active workspace.
-  aura_shell::ActivateWindow(w2.get());
+  ash::ActivateWindow(w2.get());
   EXPECT_EQ(ws2, workspace_manager()->GetActiveWorkspace());
 
   // The size of contents_view() is now ws1(500) + ws2(500) + margin(50).
@@ -95,7 +95,7 @@ TEST_F(WorkspaceControllerTest, Overview) {
 
   // Activating window w1 switches the active window and
   // the mode back to normal mode.
-  aura_shell::ActivateWindow(w1.get());
+  ash::ActivateWindow(w1.get());
   EXPECT_EQ(ws1, workspace_manager()->GetActiveWorkspace());
   EXPECT_FALSE(workspace_manager()->is_overview());
 
@@ -116,4 +116,4 @@ TEST_F(WorkspaceControllerTest, Overview) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash