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

185 files changed, 482 insertions, 484 deletions

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 30a6d98..be40c97 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -53,13 +53,13 @@ struct AcceleratorData {
 };
 
 bool HandleCycleWindow(bool forward) {
-  if (aura_shell::Shell::GetInstance()->IsScreenLocked())
+  if (ash::Shell::GetInstance()->IsScreenLocked())
     return false;
 
   // Use the same order of the windows in LauncherModel to cycle windows.
-  aura_shell::LauncherModel* model =
-      aura_shell::Shell::GetInstance()->launcher()->model();
-  aura::Window* active_window = aura_shell::GetActiveWindow();
+  ash::LauncherModel* model =
+      ash::Shell::GetInstance()->launcher()->model();
+  aura::Window* active_window = ash::GetActiveWindow();
   if (!active_window) {
     LOG(ERROR) << "No active window";
     return false;
@@ -71,7 +71,7 @@ bool HandleCycleWindow(bool forward) {
   }
   int next_index = (active_index + (forward ? 1 : -1) + model->item_count()) %
       model->item_count();
-  aura_shell::ActivateWindow(model->items()[next_index].window);
+  ash::ActivateWindow(model->items()[next_index].window);
   return true;
 }
 
@@ -120,7 +120,7 @@ bool HandlePrintLayerHierarchy() {
 
 }  // namespace
 
-namespace aura_shell {
+namespace ash {
 
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratorController, public:
@@ -203,4 +203,4 @@ bool AcceleratorController::AcceleratorPressed(
   return false;
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h
index 9670e3d..c3d83ae 100644
--- a/ash/accelerators/accelerator_controller.h
+++ b/ash/accelerators/accelerator_controller.h
@@ -18,7 +18,7 @@ namespace ui {
 class AcceleratorManager;
 }
 
-namespace aura_shell {
+namespace ash {
 
 class ScreenshotDelegate;
 
@@ -71,6 +71,6 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
   DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 6bcfd47..3c4b8cd 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -18,7 +18,7 @@
 #include "ui/base/x/x11_util.h"
 #endif
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 namespace {
@@ -144,7 +144,7 @@ TEST_F(AcceleratorControllerTest, Process) {
 TEST_F(AcceleratorControllerTest, ProcessOnce) {
   // A focused window must exist for accelerators to be processed.
   aura::Window* default_container =
-      aura_shell::Shell::GetInstance()->GetContainer(
+      ash::Shell::GetInstance()->GetContainer(
           internal::kShellWindowId_DefaultContainer);
   aura::Window* window = aura::test::CreateTestWindowWithDelegate(
       new aura::test::TestWindowDelegate,
@@ -186,7 +186,7 @@ TEST_F(AcceleratorControllerTest, ProcessOnce) {
 TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
   // A focused window must exist for accelerators to be processed.
   aura::Window* default_container =
-      aura_shell::Shell::GetInstance()->GetContainer(
+      ash::Shell::GetInstance()->GetContainer(
           internal::kShellWindowId_DefaultContainer);
   aura::Window* window = aura::test::CreateTestWindowWithDelegate(
       new aura::test::TestWindowDelegate,
@@ -222,7 +222,7 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
 
 TEST_F(AcceleratorControllerTest, HandleCycleWindow) {
   aura::Window* default_container =
-      aura_shell::Shell::GetInstance()->GetContainer(
+      ash::Shell::GetInstance()->GetContainer(
           internal::kShellWindowId_DefaultContainer);
   aura::Window* window0 = aura::test::CreateTestWindowWithDelegate(
       new aura::test::TestWindowDelegate,
@@ -259,7 +259,7 @@ TEST_F(AcceleratorControllerTest, HandleCycleWindow) {
   EXPECT_TRUE(IsActiveWindow(window0));
 
   aura::Window* modal_container =
-      aura_shell::Shell::GetInstance()->GetContainer(
+      ash::Shell::GetInstance()->GetContainer(
           internal::kShellWindowId_AlwaysOnTopContainer);
   aura::Window* modal_window = aura::test::CreateTestWindowWithDelegate(
       new aura::test::TestWindowDelegate,
@@ -298,7 +298,7 @@ TEST_F(AcceleratorControllerTest, HandleCycleWindow) {
 
   // When a screen lock window is visible, cycling window does not take effect.
   aura::Window* lock_screen_container =
-      aura_shell::Shell::GetInstance()->GetContainer(
+      ash::Shell::GetInstance()->GetContainer(
           internal::kShellWindowId_LockScreenContainer);
   aura::Window* lock_screen_window = aura::test::CreateTestWindowWithDelegate(
       new aura::test::TestWindowDelegate,
@@ -313,7 +313,7 @@ TEST_F(AcceleratorControllerTest, HandleCycleWindow) {
   // When a screen lock window is visible, cycling window does not take effect.
   // But otherwise, cycling window does take effect.
   aura::Window* lock_modal_container =
-      aura_shell::Shell::GetInstance()->GetContainer(
+      ash::Shell::GetInstance()->GetContainer(
           internal::kShellWindowId_LockModalContainer);
   aura::Window* lock_modal_window = aura::test::CreateTestWindowWithDelegate(
       new aura::test::TestWindowDelegate,
@@ -330,4 +330,4 @@ TEST_F(AcceleratorControllerTest, HandleCycleWindow) {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc
index f5ed955..f2e4b6e 100644
--- a/ash/accelerators/accelerator_filter.cc
+++ b/ash/accelerators/accelerator_filter.cc
@@ -17,7 +17,7 @@ const int kModifierFlagMask = (ui::EF_SHIFT_DOWN |
                                ui::EF_ALT_DOWN);
 }  // namespace
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -55,4 +55,4 @@ ui::TouchStatus AcceleratorFilter::PreHandleTouchEvent(
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/accelerators/accelerator_filter.h b/ash/accelerators/accelerator_filter.h
index bd8eff5..56ebfb1 100644
--- a/ash/accelerators/accelerator_filter.h
+++ b/ash/accelerators/accelerator_filter.h
@@ -11,7 +11,7 @@
 #include "ui/aura/event_filter.h"
 #include "ash/ash_export.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // AcceleratorFilter filters key events for AcceleratorControler handling global
@@ -34,6 +34,6 @@ class ASH_EXPORT AcceleratorFilter : public aura::EventFilter {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_FILTER_H_
diff --git a/ash/app_list/app_list.cc b/ash/app_list/app_list.cc
index f38ec97..31f7d6f 100644
--- a/ash/app_list/app_list.cc
+++ b/ash/app_list/app_list.cc
@@ -16,7 +16,7 @@
 #include "ui/aura/window.h"
 #include "ui/gfx/screen.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 namespace {
@@ -192,4 +192,4 @@ void AppList::OnWidgetActivationChanged(views::Widget* widget, bool active) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/app_list/app_list.h b/ash/app_list/app_list.h
index 114a3fb..d1ddf2a 100644
--- a/ash/app_list/app_list.h
+++ b/ash/app_list/app_list.h
@@ -13,7 +13,7 @@
 #include "ui/gfx/compositor/layer_animation_observer.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // AppList is a controller that manages app list UI for shell. To show the UI,
@@ -78,6 +78,6 @@ class AppList : public aura::EventFilter,
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  //  ASH_APP_LIST_APP_LIST_H_
diff --git a/ash/app_list/app_list_groups_view.cc b/ash/app_list/app_list_groups_view.cc
index bd56859..01571f1 100644
--- a/ash/app_list/app_list_groups_view.cc
+++ b/ash/app_list/app_list_groups_view.cc
@@ -15,7 +15,7 @@
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/layout/box_layout.h"
 
-namespace aura_shell {
+namespace ash {
 
 namespace {
 
@@ -240,4 +240,4 @@ void AppListGroupsView::ListItemsChanged(int start, int count) {
   NOTREACHED();
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/app_list/app_list_groups_view.h b/ash/app_list/app_list_groups_view.h
index c7d7ef2..e08660c 100644
--- a/ash/app_list/app_list_groups_view.h
+++ b/ash/app_list/app_list_groups_view.h
@@ -18,7 +18,7 @@ namespace views {
 class BoundsAnimator;
 }
 
-namespace aura_shell {
+namespace ash {
 
 class AppListItemGroupView;
 class AppListItemViewListener;
@@ -79,6 +79,6 @@ class ASH_EXPORT AppListGroupsView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(AppListGroupsView);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_APP_LIST_APP_LIST_GROUPS_VIEW_H_
diff --git a/ash/app_list/app_list_item_group_model.cc b/ash/app_list/app_list_item_group_model.cc
index 0bf3974..c2fce3a 100644
--- a/ash/app_list/app_list_item_group_model.cc
+++ b/ash/app_list/app_list_item_group_model.cc
@@ -4,7 +4,7 @@
 
 #include "ash/app_list/app_list_item_group_model.h"
 
-namespace aura_shell {
+namespace ash {
 
 AppListItemGroupModel::AppListItemGroupModel(const std::string& title)
     : title_(title) {
@@ -22,4 +22,4 @@ AppListItemModel* AppListItemGroupModel::GetItem(int index) {
   return items_.item_at(index);
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/app_list/app_list_item_group_model.h b/ash/app_list/app_list_item_group_model.h
index f7b9818..665f4a1 100644
--- a/ash/app_list/app_list_item_group_model.h
+++ b/ash/app_list/app_list_item_group_model.h
@@ -13,7 +13,7 @@
 #include "ash/ash_export.h"
 #include "ui/base/models/list_model.h"
 
-namespace aura_shell {
+namespace ash {
 
 // AppListItemGroupModel holds a list of AppListItemModels.
 class ASH_EXPORT AppListItemGroupModel {
@@ -41,6 +41,6 @@ class ASH_EXPORT AppListItemGroupModel {
   DISALLOW_COPY_AND_ASSIGN(AppListItemGroupModel);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_APP_LIST_APP_LIST_ITEM_GROUP_MODEL_H_
diff --git a/ash/app_list/app_list_item_group_view.cc b/ash/app_list/app_list_item_group_view.cc
index a316c08..ed34983 100644
--- a/ash/app_list/app_list_item_group_view.cc
+++ b/ash/app_list/app_list_item_group_view.cc
@@ -8,7 +8,7 @@
 #include "ash/app_list/app_list_item_view.h"
 #include "ui/views/layout/grid_layout.h"
 
-namespace aura_shell {
+namespace ash {
 
 AppListItemGroupView::AppListItemGroupView(AppListItemGroupModel* model,
                                            AppListItemViewListener* listener)
@@ -112,4 +112,4 @@ void AppListItemGroupView::ListItemsChanged(int start, int count) {
   NOTREACHED();
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/app_list/app_list_item_group_view.h b/ash/app_list/app_list_item_group_view.h
index 154273b..834fb59 100644
--- a/ash/app_list/app_list_item_group_view.h
+++ b/ash/app_list/app_list_item_group_view.h
@@ -10,7 +10,7 @@
 #include "ui/base/models/list_model_observer.h"
 #include "ui/views/view.h"
 
-namespace aura_shell {
+namespace ash {
 
 class AppListItemGroupModel;
 class AppListItemViewListener;
@@ -60,6 +60,6 @@ class ASH_EXPORT AppListItemGroupView
   DISALLOW_COPY_AND_ASSIGN(AppListItemGroupView);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_APP_LIST_APP_LIST_ITEM_GROUP_VIEW_H_
diff --git a/ash/app_list/app_list_item_model.cc b/ash/app_list/app_list_item_model.cc
index 99708a7..e0d891b 100644
--- a/ash/app_list/app_list_item_model.cc
+++ b/ash/app_list/app_list_item_model.cc
@@ -6,7 +6,7 @@
 
 #include "ash/app_list/app_list_item_model_observer.h"
 
-namespace aura_shell {
+namespace ash {
 
 AppListItemModel::AppListItemModel() {
 }
@@ -34,4 +34,4 @@ void AppListItemModel::RemoveObserver(AppListItemModelObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/app_list/app_list_item_model.h b/ash/app_list/app_list_item_model.h
index 21eb312..463c837 100644
--- a/ash/app_list/app_list_item_model.h
+++ b/ash/app_list/app_list_item_model.h
@@ -13,7 +13,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ash/ash_export.h"
 
-namespace aura_shell {
+namespace ash {
 
 class AppListItemModelObserver;
 
@@ -49,6 +49,6 @@ class ASH_EXPORT AppListItemModel {
   DISALLOW_COPY_AND_ASSIGN(AppListItemModel);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // #define ASH_APP_LIST_APP_LIST_ITEM_MODEL_OBSERVER_H_
diff --git a/ash/app_list/app_list_item_model_observer.h b/ash/app_list/app_list_item_model_observer.h
index c80b440..7a22fa9 100644
--- a/ash/app_list/app_list_item_model_observer.h
+++ b/ash/app_list/app_list_item_model_observer.h
@@ -8,7 +8,7 @@
 
 #include "ash/ash_export.h"
 
-namespace aura_shell {
+namespace ash {
 
 class ASH_EXPORT AppListItemModelObserver {
  public:
@@ -22,6 +22,6 @@ class ASH_EXPORT AppListItemModelObserver {
   virtual ~AppListItemModelObserver() {}
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_APP_LIST_APP_LIST_ITEM_MODEL_OBSERVER_H_
diff --git a/ash/app_list/app_list_item_view.cc b/ash/app_list/app_list_item_view.cc
index 8d16f07..41c1f89 100644
--- a/ash/app_list/app_list_item_view.cc
+++ b/ash/app_list/app_list_item_view.cc
@@ -17,7 +17,7 @@
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 
 namespace {
 
@@ -159,4 +159,4 @@ void AppListItemView::OnPaintFocusBorder(gfx::Canvas* canvas) {
   // No focus border for AppListItemView.
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/app_list/app_list_item_view.h b/ash/app_list/app_list_item_view.h
index 2c01d6b..120d97c 100644
--- a/ash/app_list/app_list_item_view.h
+++ b/ash/app_list/app_list_item_view.h
@@ -17,7 +17,7 @@ class ImageView;
 class Label;
 }
 
-namespace aura_shell {
+namespace ash {
 
 class AppListItemModel;
 class AppListItemViewListener;
@@ -67,6 +67,6 @@ class ASH_EXPORT AppListItemView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(AppListItemView);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_APP_LIST_APP_LIST_ITEM_VIEW_H_
diff --git a/ash/app_list/app_list_item_view_listener.h b/ash/app_list/app_list_item_view_listener.h
index 57e56a4..a008f72 100644
--- a/ash/app_list/app_list_item_view_listener.h
+++ b/ash/app_list/app_list_item_view_listener.h
@@ -8,7 +8,7 @@
 
 #include "ash/ash_export.h"
 
-namespace aura_shell {
+namespace ash {
 
 class AppListItemView;
 
@@ -22,6 +22,6 @@ class ASH_EXPORT AppListItemViewListener {
   virtual ~AppListItemViewListener() {}
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_APP_LIST_APP_LIST_ITEM_VIEW_LISTENER_H_
diff --git a/ash/app_list/app_list_model.cc b/ash/app_list/app_list_model.cc
index 7b49e15..8362dd6 100644
--- a/ash/app_list/app_list_model.cc
+++ b/ash/app_list/app_list_model.cc
@@ -4,7 +4,7 @@
 
 #include "ash/app_list/app_list_model.h"
 
-namespace aura_shell {
+namespace ash {
 
 AppListModel::AppListModel() {
 }
@@ -29,4 +29,4 @@ void AppListModel::RemoveObserver(ui::ListModelObserver* observer) {
   groups_.RemoveObserver(observer);
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/app_list/app_list_model.h b/ash/app_list/app_list_model.h
index 028ced7..bb797a1 100644
--- a/ash/app_list/app_list_model.h
+++ b/ash/app_list/app_list_model.h
@@ -11,7 +11,7 @@
 #include "ash/ash_export.h"
 #include "ui/base/models/list_model.h"
 
-namespace aura_shell {
+namespace ash {
 
 // Model for AppListView. It is consisted of a list of AppListItemGroupModels,
 // which in turn owns a list of AppListItemModels.
@@ -36,6 +36,6 @@ class ASH_EXPORT AppListModel {
   DISALLOW_COPY_AND_ASSIGN(AppListModel);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_APP_LIST_APP_LIST_MODEL_H_
diff --git a/ash/app_list/app_list_view.cc b/ash/app_list/app_list_view.cc
index 1d7d790..9b019ab 100644
--- a/ash/app_list/app_list_view.cc
+++ b/ash/app_list/app_list_view.cc
@@ -12,13 +12,13 @@
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 
 AppListView::AppListView(
     AppListModel* model,
     AppListViewDelegate* delegate,
     const gfx::Rect& bounds,
-    const aura_shell::ShellDelegate::SetWidgetCallback& callback)
+    const ash::ShellDelegate::SetWidgetCallback& callback)
     : model_(model),
       delegate_(delegate) {
   Init(bounds, callback);
@@ -77,4 +77,4 @@ void AppListView::AppListItemActivated(AppListItemView* sender,
   Close();
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/app_list/app_list_view.h b/ash/app_list/app_list_view.h
index 27fc8a2..35fd0d7 100644
--- a/ash/app_list/app_list_view.h
+++ b/ash/app_list/app_list_view.h
@@ -16,7 +16,7 @@ namespace views {
 class View;
 }
 
-namespace aura_shell {
+namespace ash {
 
 class AppListModel;
 class AppListViewDelegate;
@@ -56,6 +56,6 @@ class ASH_EXPORT AppListView : public views::WidgetDelegateView,
   DISALLOW_COPY_AND_ASSIGN(AppListView);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_APP_LIST_APP_LIST_VIEW_H_
diff --git a/ash/app_list/app_list_view_delegate.h b/ash/app_list/app_list_view_delegate.h
index ab55d56..875fa6b 100644
--- a/ash/app_list/app_list_view_delegate.h
+++ b/ash/app_list/app_list_view_delegate.h
@@ -8,7 +8,7 @@
 
 #include "ash/ash_export.h"
 
-namespace aura_shell {
+namespace ash {
 
 class AppListItemModel;
 
@@ -22,6 +22,6 @@ class ASH_EXPORT AppListViewDelegate {
                                       int event_flags) = 0;
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_APP_LIST_APP_LIST_VIEW_DELEGATE_H_
diff --git a/ash/app_list/drop_shadow_label.cc b/ash/app_list/drop_shadow_label.cc
index f227b06..0543aec 100644
--- a/ash/app_list/drop_shadow_label.cc
+++ b/ash/app_list/drop_shadow_label.cc
@@ -12,7 +12,7 @@
 
 using views::Label;
 
-namespace aura_shell {
+namespace ash {
 
 static const int kDefaultDropShadowSize = 2;
 
@@ -115,4 +115,4 @@ gfx::Size DropShadowLabel::GetTextSize() const {
   return text_size;
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/app_list/drop_shadow_label.h b/ash/app_list/drop_shadow_label.h
index cfd5d55..2a7ce5d 100644
--- a/ash/app_list/drop_shadow_label.h
+++ b/ash/app_list/drop_shadow_label.h
@@ -9,7 +9,7 @@
 #include "ui/gfx/font.h"
 #include "ui/views/controls/label.h"
 
-namespace aura_shell {
+namespace ash {
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -49,6 +49,6 @@ class DropShadowLabel : public views::Label  {
   DISALLOW_COPY_AND_ASSIGN(DropShadowLabel);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_APP_LIST_DROP_SHADOW_LABEL_H_
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index 21afae7..21e204f 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -8,7 +8,7 @@
 
 #include "base/command_line.h"
 
-namespace aura_shell {
+namespace ash {
 namespace switches {
 
 // Avoid drawing drop shadows under windows.
@@ -41,4 +41,4 @@ bool IsAuraWindowModeCompact() {
 }
 
 }  // namespace switches
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index 559f1cf..a1044ae 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -8,7 +8,7 @@
 
 #include "ash/ash_export.h"
 
-namespace aura_shell {
+namespace ash {
 namespace switches {
 
 // Please keep alphabetized.
@@ -24,6 +24,6 @@ ASH_EXPORT extern const char kAuraWorkspaceManager[];
 ASH_EXPORT bool IsAuraWindowModeCompact();
 
 }  // namespace switches
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_ASH_SWITCHES_H_
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc
index 25764ed..27401cf 100644
--- a/ash/desktop_background/desktop_background_view.cc
+++ b/ash/desktop_background/desktop_background_view.cc
@@ -14,7 +14,7 @@
 #include "ui/gfx/canvas.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -55,7 +55,7 @@ views::Widget* CreateDesktopBackground() {
   params.delegate = view;
   desktop_widget->Init(params);
   Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_DesktopBackgroundContainer)->
+      ash::internal::kShellWindowId_DesktopBackgroundContainer)->
       AddChild(desktop_widget->GetNativeView());
   desktop_widget->SetContentsView(view);
   desktop_widget->Show();
@@ -64,4 +64,4 @@ views::Widget* CreateDesktopBackground() {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/desktop_background/desktop_background_view.h b/ash/desktop_background/desktop_background_view.h
index 8f8912b..6af6583 100644
--- a/ash/desktop_background/desktop_background_view.h
+++ b/ash/desktop_background/desktop_background_view.h
@@ -10,7 +10,7 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class DesktopBackgroundView : public views::WidgetDelegateView {
@@ -30,6 +30,6 @@ class DesktopBackgroundView : public views::WidgetDelegateView {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_DESKTOP_BACKGROUND_DESKTOP_BACKGROUND_VIEW_H_
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
index ef0cf6c..48e43d0 100644
--- a/ash/drag_drop/drag_drop_controller.cc
+++ b/ash/drag_drop/drag_drop_controller.cc
@@ -16,7 +16,7 @@
 #include "ui/gfx/rect.h"
 #include "ui/views/widget/native_widget_aura.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 using aura::RootWindow;
@@ -173,4 +173,4 @@ void DragDropController::Cleanup() {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
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_
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc
index db4ae5e..bea60aa 100644
--- a/ash/drag_drop/drag_drop_controller_unittest.cc
+++ b/ash/drag_drop/drag_drop_controller_unittest.cc
@@ -16,7 +16,7 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 namespace {
diff --git a/ash/drag_drop/drag_image_view.cc b/ash/drag_drop/drag_image_view.cc
index 13e4193..993d4b8 100644
--- a/ash/drag_drop/drag_image_view.cc
+++ b/ash/drag_drop/drag_image_view.cc
@@ -6,7 +6,7 @@
 
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 namespace {
@@ -57,4 +57,4 @@ void DragImageView::SetWidgetVisible(bool visible) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/drag_drop/drag_image_view.h b/ash/drag_drop/drag_image_view.h
index 2e75034..fa1f4ee 100644
--- a/ash/drag_drop/drag_image_view.h
+++ b/ash/drag_drop/drag_image_view.h
@@ -12,7 +12,7 @@ namespace views {
 class Widget;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class DragImageView : public views::ImageView {
@@ -36,6 +36,6 @@ class DragImageView : public views::ImageView {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
diff --git a/ash/launcher/app_launcher_button.cc b/ash/launcher/app_launcher_button.cc
index 9c9bd23..9f6c121 100644
--- a/ash/launcher/app_launcher_button.cc
+++ b/ash/launcher/app_launcher_button.cc
@@ -9,7 +9,7 @@
 #include "ash/launcher/launcher_button_host.h"
 #include "ui/gfx/canvas_skia.h"
 
-namespace aura_shell {
+namespace ash {
 
 namespace internal {
 
@@ -77,4 +77,4 @@ bool AppLauncherButton::OnMouseDragged(const views::MouseEvent& event) {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/launcher/app_launcher_button.h b/ash/launcher/app_launcher_button.h
index 5ee9b4c..b9b0f74 100644
--- a/ash/launcher/app_launcher_button.h
+++ b/ash/launcher/app_launcher_button.h
@@ -8,7 +8,7 @@
 
 #include "ui/views/controls/button/image_button.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class LauncherButtonHost;
@@ -37,6 +37,6 @@ class AppLauncherButton : public views::ImageButton {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_LAUNCHER_APP_LAUNCHER_BUTTON_H_
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index cd91f0a..68130dc 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -18,7 +18,7 @@
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 
 namespace {
 
@@ -102,7 +102,7 @@ Launcher::Launcher(aura::Window* window_container)
   params.create_texture_for_layer = true;
   params.transparent = true;
   params.parent = Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LauncherContainer);
+      ash::internal::kShellWindowId_LauncherContainer);
   internal::LauncherView* launcher_view =
       new internal::LauncherView(model_.get());
   launcher_view->Init();
@@ -180,4 +180,4 @@ void Launcher::OnWindowVisibilityChanged(aura::Window* window,
     MaybeAdd(window);
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/launcher/launcher.h b/ash/launcher/launcher.h
index 0e7c97b..9b31274 100644
--- a/ash/launcher/launcher.h
+++ b/ash/launcher/launcher.h
@@ -21,7 +21,7 @@ namespace views {
 class Widget;
 }
 
-namespace aura_shell {
+namespace ash {
 
 class LauncherModel;
 
@@ -69,6 +69,6 @@ class ASH_EXPORT Launcher : public aura::WindowObserver {
   DISALLOW_COPY_AND_ASSIGN(Launcher);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_H_
diff --git a/ash/launcher/launcher_button_host.h b/ash/launcher/launcher_button_host.h
index 32a5241..b89c4be 100644
--- a/ash/launcher/launcher_button_host.h
+++ b/ash/launcher/launcher_button_host.h
@@ -11,7 +11,7 @@ class MouseEvent;
 class View;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // The launcher buttons communicate back to the host by way of this interface.
@@ -35,6 +35,6 @@ class LauncherButtonHost {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_BUTTON_HOST_H_
diff --git a/ash/launcher/launcher_model.cc b/ash/launcher/launcher_model.cc
index ec19026..9f5c659 100644
--- a/ash/launcher/launcher_model.cc
+++ b/ash/launcher/launcher_model.cc
@@ -7,7 +7,7 @@
 #include "ui/aura/window.h"
 #include "ash/launcher/launcher_model_observer.h"
 
-namespace aura_shell {
+namespace ash {
 
 LauncherModel::LauncherModel() {
 }
@@ -84,4 +84,4 @@ void LauncherModel::RemoveObserver(LauncherModelObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/launcher/launcher_model.h b/ash/launcher/launcher_model.h
index 7692843..231493a 100644
--- a/ash/launcher/launcher_model.h
+++ b/ash/launcher/launcher_model.h
@@ -16,7 +16,7 @@ namespace aura {
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 
 class LauncherModelObserver;
 
@@ -62,6 +62,6 @@ class ASH_EXPORT LauncherModel {
   DISALLOW_COPY_AND_ASSIGN(LauncherModel);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_MODEL_H_
diff --git a/ash/launcher/launcher_model_observer.h b/ash/launcher/launcher_model_observer.h
index e3979c6..817dc9b 100644
--- a/ash/launcher/launcher_model_observer.h
+++ b/ash/launcher/launcher_model_observer.h
@@ -8,7 +8,7 @@
 
 #include "ash/ash_export.h"
 
-namespace aura_shell {
+namespace ash {
 
 class ASH_EXPORT LauncherModelObserver {
  public:
@@ -34,6 +34,6 @@ class ASH_EXPORT LauncherModelObserver {
   virtual ~LauncherModelObserver() {}
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_MODEL_OBSERVER_H_
diff --git a/ash/launcher/launcher_model_unittest.cc b/ash/launcher/launcher_model_unittest.cc
index 3c50b1e..0ace0be 100644
--- a/ash/launcher/launcher_model_unittest.cc
+++ b/ash/launcher/launcher_model_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace aura_shell {
+namespace ash {
 
 namespace {
 
@@ -119,4 +119,4 @@ TEST(LauncherModel, BasicAssertions) {
   EXPECT_EQ(reinterpret_cast<void*>(2), model.items()[1].user_data);
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/launcher/launcher_types.h b/ash/launcher/launcher_types.h
index a6ac51f..664694a 100644
--- a/ash/launcher/launcher_types.h
+++ b/ash/launcher/launcher_types.h
@@ -15,7 +15,7 @@ namespace aura {
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 
 // Type the LauncherItem represents.
 enum ASH_EXPORT LauncherItemType {
@@ -62,6 +62,6 @@ struct ASH_EXPORT LauncherItem {
 
 typedef std::vector<LauncherItem> LauncherItems;
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_TYPES_H_
diff --git a/ash/launcher/launcher_unittest.cc b/ash/launcher/launcher_unittest.cc
index 60aa2f0..e175030 100644
--- a/ash/launcher/launcher_unittest.cc
+++ b/ash/launcher/launcher_unittest.cc
@@ -9,9 +9,9 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
-typedef aura_shell::test::AuraShellTestBase LauncherTest;
+typedef ash::test::AuraShellTestBase LauncherTest;
 
-namespace aura_shell {
+namespace ash {
 
 // Makes sure invoking SetStatusWidth on the launcher changes the size of the
 // LauncherView.
@@ -28,4 +28,4 @@ TEST_F(LauncherTest, SetStatusWidth) {
   EXPECT_EQ(total_width - total_width / 2, launcher_view->width());
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index 7b5d2ea..9920072 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -29,7 +29,7 @@
 using ui::Animation;
 using views::View;
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // Padding between each view.
@@ -594,4 +594,4 @@ void LauncherView::ButtonPressed(views::Button* sender,
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index 27617a0..782f1cf 100644
--- a/ash/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -19,7 +19,7 @@ class ImageButton;
 class MenuRunner;
 }
 
-namespace aura_shell {
+namespace ash {
 
 struct LauncherItem;
 class LauncherModel;
@@ -145,6 +145,6 @@ class LauncherView : public views::WidgetDelegateView,
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_VIEW_H_
diff --git a/ash/launcher/tabbed_launcher_button.cc b/ash/launcher/tabbed_launcher_button.cc
index a07b596..61a2d5a 100644
--- a/ash/launcher/tabbed_launcher_button.cc
+++ b/ash/launcher/tabbed_launcher_button.cc
@@ -14,7 +14,7 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/insets.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // The images drawn inside the background tab are drawn at this offset from
@@ -193,4 +193,4 @@ TabbedLauncherButton::ImageSet* TabbedLauncherButton::CreateImageSet(
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/launcher/tabbed_launcher_button.h b/ash/launcher/tabbed_launcher_button.h
index 5e9dacd..3a42951 100644
--- a/ash/launcher/tabbed_launcher_button.h
+++ b/ash/launcher/tabbed_launcher_button.h
@@ -17,7 +17,7 @@ namespace ui {
 class MultiAnimation;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class LauncherButtonHost;
@@ -101,6 +101,6 @@ class TabbedLauncherButton : public views::ImageButton {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_LAUNCHER_TABBED_LAUNCHER_BUTTON_H_
diff --git a/ash/launcher/view_model.cc b/ash/launcher/view_model.cc
index 668f16f..7450133 100644
--- a/ash/launcher/view_model.cc
+++ b/ash/launcher/view_model.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "ui/views/view.h"
 
-namespace aura_shell {
+namespace ash {
 
 ViewModel::ViewModel() {
 }
@@ -52,4 +52,4 @@ int ViewModel::GetIndexOfView(views::View* view) const {
   return -1;
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/launcher/view_model.h b/ash/launcher/view_model.h
index 67388c7..ab4d897 100644
--- a/ash/launcher/view_model.h
+++ b/ash/launcher/view_model.h
@@ -16,7 +16,7 @@ namespace views {
 class View;
 }
 
-namespace aura_shell {
+namespace ash {
 
 // ViewModel is used to track an 'interesting' set of a views. Often times
 // during animations views are removed after a delay, which makes for tricky
@@ -77,6 +77,6 @@ class ASH_EXPORT ViewModel {
   DISALLOW_COPY_AND_ASSIGN(ViewModel);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_LAUNCHER_VIEW_MODEL_H_
diff --git a/ash/launcher/view_model_unittest.cc b/ash/launcher/view_model_unittest.cc
index 17ebd23..089302c 100644
--- a/ash/launcher/view_model_unittest.cc
+++ b/ash/launcher/view_model_unittest.cc
@@ -7,7 +7,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/view.h"
 
-namespace aura_shell {
+namespace ash {
 
 TEST(ViewModel, BasicAssertions) {
   views::View v1;
@@ -38,4 +38,4 @@ TEST(ViewModel, Move) {
   EXPECT_EQ(&v3, model.view_at(2));
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/launcher/view_model_utils.cc b/ash/launcher/view_model_utils.cc
index e17370e..dca6d51 100644
--- a/ash/launcher/view_model_utils.cc
+++ b/ash/launcher/view_model_utils.cc
@@ -9,7 +9,7 @@
 #include "ash/launcher/view_model.h"
 #include "ui/views/view.h"
 
-namespace aura_shell {
+namespace ash {
 
 // static
 void ViewModelUtils::SetViewBoundsToIdealBounds(const ViewModel& model) {
@@ -45,4 +45,4 @@ int ViewModelUtils::DetermineMoveIndex(const ViewModel& model,
   return model.view_size() - 1;
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/launcher/view_model_utils.h b/ash/launcher/view_model_utils.h
index 89c748c..26d25de 100644
--- a/ash/launcher/view_model_utils.h
+++ b/ash/launcher/view_model_utils.h
@@ -13,7 +13,7 @@ namespace views {
 class View;
 }
 
-namespace aura_shell {
+namespace ash {
 
 class ViewModel;
 
@@ -31,6 +31,6 @@ class ASH_EXPORT ViewModelUtils {
   DISALLOW_IMPLICIT_CONSTRUCTORS(ViewModelUtils);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_LAUNCHER_VIEW_MODEL_UTILS_H_
diff --git a/ash/launcher/view_model_utils_unittest.cc b/ash/launcher/view_model_utils_unittest.cc
index a1486d8..54989fb 100644
--- a/ash/launcher/view_model_utils_unittest.cc
+++ b/ash/launcher/view_model_utils_unittest.cc
@@ -8,7 +8,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/view.h"
 
-namespace aura_shell {
+namespace ash {
 
 // Makes sure SetViewBoundsToIdealBounds updates the view appropriately.
 TEST(ViewModelUtils, SetViewBoundsToIdealBounds) {
@@ -43,4 +43,4 @@ TEST(ViewModelUtils, DetermineMoveIndex) {
   EXPECT_EQ(2, ViewModelUtils::DetermineMoveIndex(model, &v2, 12));
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/screenshot_delegate.h b/ash/screenshot_delegate.h
index 56b29c9..b698a36 100644
--- a/ash/screenshot_delegate.h
+++ b/ash/screenshot_delegate.h
@@ -6,7 +6,7 @@
 #define ASH_SCREENSHOT_DELEGATE_H_
 #pragma once
 
-namespace aura_shell {
+namespace ash {
 
 // Delegate for taking screenshots.
 class ScreenshotDelegate {
@@ -17,6 +17,6 @@ class ScreenshotDelegate {
   // when the user wants to take a screenshot manually.
   virtual void HandleTakeScreenshot() = 0;
 };
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_SCREENSHOT_DELEGATE_H_
diff --git a/ash/shell.cc b/ash/shell.cc
index 405887e..3e132d5 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -43,7 +43,7 @@
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 
 namespace {
 
@@ -366,4 +366,4 @@ void Shell::EnableWorkspaceManager() {
           workspace_controller_->workspace_manager()));
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/shell.h b/ash/shell.h
index 7b0470a..a37c822 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -29,7 +29,7 @@ class Rect;
 class Size;
 }
 
-namespace aura_shell {
+namespace ash {
 
 class AcceleratorController;
 class Launcher;
@@ -144,6 +144,6 @@ class ASH_EXPORT Shell {
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_SHELL_H_
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc
index 5f260cd..78639da 100644
--- a/ash/shell/app_list.cc
+++ b/ash/shell/app_list.cc
@@ -18,7 +18,7 @@ namespace shell {
 
 namespace {
 
-class WindowTypeLauncherItem : public aura_shell::AppListItemModel {
+class WindowTypeLauncherItem : public ash::AppListItemModel {
  public:
   enum Type {
     TOPLEVEL_WINDOW = 0,
@@ -45,8 +45,8 @@ class WindowTypeLauncherItem : public aura_shell::AppListItemModel {
 
     SkBitmap icon;
     icon.setConfig(SkBitmap::kARGB_8888_Config,
-                   aura_shell::AppListItemView::kIconSize,
-                   aura_shell::AppListItemView::kIconSize);
+                   ash::AppListItemView::kIconSize,
+                   ash::AppListItemView::kIconSize);
     icon.allocPixels();
     icon.eraseColor(kColors[static_cast<int>(type) % arraysize(kColors)]);
     return icon;
@@ -104,12 +104,12 @@ class WindowTypeLauncherItem : public aura_shell::AppListItemModel {
   DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncherItem);
 };
 
-class ExampleAppListViewDelegate : public aura_shell::AppListViewDelegate {
+class ExampleAppListViewDelegate : public ash::AppListViewDelegate {
  public:
   ExampleAppListViewDelegate() {}
 
  private:
-  virtual void OnAppListItemActivated(aura_shell::AppListItemModel* item,
+  virtual void OnAppListItemActivated(ash::AppListItemModel* item,
                                       int event_flags) OVERRIDE {
     static_cast<WindowTypeLauncherItem*>(item)->Activate(event_flags);
   }
@@ -117,12 +117,12 @@ class ExampleAppListViewDelegate : public aura_shell::AppListViewDelegate {
   DISALLOW_COPY_AND_ASSIGN(ExampleAppListViewDelegate);
 };
 
-aura_shell::AppListItemGroupModel* CreateGroup(
+ash::AppListItemGroupModel* CreateGroup(
     const std::string& title,
     WindowTypeLauncherItem::Type start_type,
     WindowTypeLauncherItem::Type end_type) {
-  aura_shell::AppListItemGroupModel* group =
-      new aura_shell::AppListItemGroupModel(title);
+  ash::AppListItemGroupModel* group =
+      new ash::AppListItemGroupModel(title);
   for (int i = static_cast<int>(start_type);
        i < static_cast<int>(end_type);
        ++i) {
@@ -135,7 +135,7 @@ aura_shell::AppListItemGroupModel* CreateGroup(
 
 }  // namespace
 
-void BuildAppListModel(aura_shell::AppListModel* model) {
+void BuildAppListModel(ash::AppListModel* model) {
   model->AddGroup(CreateGroup("Windows",
       WindowTypeLauncherItem::TOPLEVEL_WINDOW,
       WindowTypeLauncherItem::WIDGETS_WINDOW));
@@ -144,18 +144,18 @@ void BuildAppListModel(aura_shell::AppListModel* model) {
       WindowTypeLauncherItem::LAST_TYPE));
 }
 
-aura_shell::AppListViewDelegate* CreateAppListViewDelegate() {
+ash::AppListViewDelegate* CreateAppListViewDelegate() {
   return new ExampleAppListViewDelegate;
 }
 
 // TODO(xiyuan): Remove this.
 void CreateAppList(
     const gfx::Rect& bounds,
-    const aura_shell::ShellDelegate::SetWidgetCallback& callback) {
-  aura_shell::AppListModel* model = new aura_shell::AppListModel;
+    const ash::ShellDelegate::SetWidgetCallback& callback) {
+  ash::AppListModel* model = new ash::AppListModel;
   BuildAppListModel(model);
 
-  new aura_shell::AppListView(
+  new ash::AppListView(
       model,
       CreateAppListViewDelegate(),
       bounds,
diff --git a/ash/shell/example_factory.h b/ash/shell/example_factory.h
index eaea874..f6fdeac 100644
--- a/ash/shell/example_factory.h
+++ b/ash/shell/example_factory.h
@@ -8,7 +8,7 @@
 
 #include "ash/shell_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 class AppListModel;
 class AppListViewDelegate;
 }
@@ -27,13 +27,13 @@ void CreateLockScreen();
 // Creates a window showing samples of commonly used widgets.
 void CreateWidgetsWindow();
 
-void BuildAppListModel(aura_shell::AppListModel* model);
+void BuildAppListModel(ash::AppListModel* model);
 
-aura_shell::AppListViewDelegate* CreateAppListViewDelegate();
+ash::AppListViewDelegate* CreateAppListViewDelegate();
 
 void CreateAppList(
     const gfx::Rect& bounds,
-    const aura_shell::ShellDelegate::SetWidgetCallback& callback);
+    const ash::ShellDelegate::SetWidgetCallback& callback);
 
 }  // namespace shell
 }  // namespace ash
diff --git a/ash/shell/lock_view.cc b/ash/shell/lock_view.cc
index 739649a..245bcee 100644
--- a/ash/shell/lock_view.cc
+++ b/ash/shell/lock_view.cc
@@ -13,7 +13,7 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
-using aura_shell::Shell;
+using ash::Shell;
 
 namespace ash {
 namespace shell {
@@ -63,7 +63,7 @@ void CreateLockScreen() {
   params.delegate = lock_view;
   widget->Init(params);
   Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LockScreenContainer)->
+      ash::internal::kShellWindowId_LockScreenContainer)->
       AddChild(widget->GetNativeView());
   widget->SetContentsView(lock_view);
   widget->Show();
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
index 0e5d961..4ebbc69 100644
--- a/ash/shell/shell_main.cc
+++ b/ash/shell/shell_main.cc
@@ -25,7 +25,7 @@
 
 namespace {
 
-class ShellDelegateImpl : public aura_shell::ShellDelegate {
+class ShellDelegateImpl : public ash::ShellDelegate {
  public:
   ShellDelegateImpl() {
   }
@@ -38,7 +38,7 @@ class ShellDelegateImpl : public aura_shell::ShellDelegate {
   }
 
   virtual views::Widget* CreateStatusArea() OVERRIDE {
-    return aura_shell::internal::CreateStatusArea();
+    return ash::internal::CreateStatusArea();
   }
 
   virtual void RequestAppListWidget(
@@ -51,20 +51,20 @@ class ShellDelegateImpl : public aura_shell::ShellDelegate {
     ash::shell::CreateAppList(bounds, callback);
   }
 
-  virtual void BuildAppListModel(aura_shell::AppListModel* model) {
+  virtual void BuildAppListModel(ash::AppListModel* model) {
     ash::shell::BuildAppListModel(model);
   }
 
-  virtual aura_shell::AppListViewDelegate* CreateAppListViewDelegate() {
+  virtual ash::AppListViewDelegate* CreateAppListViewDelegate() {
     return ash::shell::CreateAppListViewDelegate();
   }
 
   virtual void LauncherItemClicked(
-      const aura_shell::LauncherItem& item) OVERRIDE {
-    aura_shell::ActivateWindow(item.window);
+      const ash::LauncherItem& item) OVERRIDE {
+    ash::ActivateWindow(item.window);
   }
 
-  virtual bool ConfigureLauncherItem(aura_shell::LauncherItem* item) OVERRIDE {
+  virtual bool ConfigureLauncherItem(ash::LauncherItem* item) OVERRIDE {
     static int image_count = 0;
     item->tab_images.resize(image_count + 1);
     for (int i = 0; i < image_count + 1; ++i) {
@@ -108,13 +108,13 @@ int main(int argc, char** argv) {
   if (!views::ViewsDelegate::views_delegate)
     views::ViewsDelegate::views_delegate = new views::TestViewsDelegate;
 
-  aura_shell::Shell::CreateInstance(new ShellDelegateImpl);
+  ash::Shell::CreateInstance(new ShellDelegateImpl);
 
   ash::shell::InitWindowTypeLauncher();
 
   aura::RootWindow::GetInstance()->Run();
 
-  aura_shell::Shell::DeleteInstance();
+  ash::Shell::DeleteInstance();
 
   aura::RootWindow::DeleteInstance();
 
diff --git a/ash/shell/toplevel_window.cc b/ash/shell/toplevel_window.cc
index 01f28f8..9eb9d90 100644
--- a/ash/shell/toplevel_window.cc
+++ b/ash/shell/toplevel_window.cc
@@ -54,7 +54,7 @@ bool ToplevelWindow::CanMaximize() const {
 }
 
 views::NonClientFrameView* ToplevelWindow::CreateNonClientFrameView() {
-  return new aura_shell::internal::ToplevelFrameView;
+  return new ash::internal::ToplevelFrameView;
 }
 
 }  // namespace shell
diff --git a/ash/shell/widgets.cc b/ash/shell/widgets.cc
index ee89bf2..b5de2f5 100644
--- a/ash/shell/widgets.cc
+++ b/ash/shell/widgets.cc
@@ -123,7 +123,7 @@ string16 WidgetsWindow::GetWindowTitle() const {
 }
 
 views::NonClientFrameView* WidgetsWindow::CreateNonClientFrameView() {
-  return new aura_shell::internal::ToplevelFrameView;
+  return new ash::internal::ToplevelFrameView;
 }
 
 }  // namespace
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc
index 85028ca..49c10e4 100644
--- a/ash/shell/window_type_launcher.cc
+++ b/ash/shell/window_type_launcher.cc
@@ -145,8 +145,8 @@ void InitWindowTypeLauncher() {
       views::Widget::CreateWindowWithBounds(new WindowTypeLauncher,
                                             gfx::Rect(120, 150, 400, 300));
   widget->GetNativeView()->SetName("WindowTypeLauncher");
-  aura_shell::internal::SetShadowType(widget->GetNativeView(),
-                                      aura_shell::internal::SHADOW_TYPE_NONE);
+  ash::internal::SetShadowType(widget->GetNativeView(),
+                                      ash::internal::SHADOW_TYPE_NONE);
   widget->Show();
 }
 
@@ -257,7 +257,7 @@ string16 WindowTypeLauncher::GetWindowTitle() const {
 }
 
 views::NonClientFrameView* WindowTypeLauncher::CreateNonClientFrameView() {
-  return new aura_shell::internal::ToplevelFrameView;
+  return new ash::internal::ToplevelFrameView;
 }
 
 void WindowTypeLauncher::ButtonPressed(views::Button* sender,
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index bf73c5e..09bd8a9c 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -17,7 +17,7 @@ namespace views {
 class Widget;
 }
 
-namespace aura_shell {
+namespace ash {
 
 class AppListModel;
 class AppListViewDelegate;
@@ -62,6 +62,6 @@ class ASH_EXPORT ShellDelegate {
   // return true.
   virtual bool ConfigureLauncherItem(LauncherItem* item) = 0;
 };
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_SHELL_DELEGATE_H_
diff --git a/ash/shell_factory.h b/ash/shell_factory.h
index 639de9f..4b88f3e 100644
--- a/ash/shell_factory.h
+++ b/ash/shell_factory.h
@@ -14,14 +14,14 @@ class Widget;
 
 // Declarations of shell component factory functions.
 
-namespace aura_shell {
+namespace ash {
 
 namespace internal {
 views::Widget* CreateDesktopBackground();
 ASH_EXPORT views::Widget* CreateStatusArea();
 }  // namespace internal
 
-}  // namespace aura_shell
+}  // namespace ash
 
 
 #endif  // ASH_SHELL_FACTORY_H_
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 1a6c6dc..0871ee8 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -15,7 +15,7 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 
 namespace {
 
@@ -27,12 +27,12 @@ views::Widget* CreateTestWindow(const views::Widget::InitParams& params) {
 
 aura::Window* GetDefaultContainer() {
   return Shell::GetInstance()->GetContainer(
-        aura_shell::internal::kShellWindowId_DefaultContainer);
+        ash::internal::kShellWindowId_DefaultContainer);
 }
 
 aura::Window* GetAlwaysOnTopContainer() {
   return Shell::GetInstance()->GetContainer(
-        aura_shell::internal::kShellWindowId_AlwaysOnTopContainer);
+        ash::internal::kShellWindowId_AlwaysOnTopContainer);
 }
 
 void TestCreateWindow(views::Widget::InitParams::Type type,
@@ -163,7 +163,7 @@ TEST_F(ShellTest, CreateModalWindow) {
 
   // It should be in modal container.
   aura::Window* modal_container = Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_ModalContainer);
+      ash::internal::kShellWindowId_ModalContainer);
   EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent());
 
   modal_widget->Close();
@@ -183,14 +183,14 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) {
 
   // Create a LockScreen window.
   views::Widget* lock_widget = CreateTestWindow(widget_params);
-  aura_shell::Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LockScreenContainer)->
+  ash::Shell::GetInstance()->GetContainer(
+      ash::internal::kShellWindowId_LockScreenContainer)->
       AddChild(lock_widget->GetNativeView());
   lock_widget->Show();
 
   // It should be in LockScreen container.
   aura::Window* lock_screen = Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LockScreenContainer);
+      ash::internal::kShellWindowId_LockScreenContainer);
   EXPECT_EQ(lock_screen, lock_widget->GetNativeWindow()->parent());
 
   // Create a modal window with a lock window as parent.
@@ -200,7 +200,7 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) {
 
   // It should be in LockScreen modal container.
   aura::Window* lock_modal_container = Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LockModalContainer);
+      ash::internal::kShellWindowId_LockModalContainer);
   EXPECT_EQ(lock_modal_container,
             lock_modal_widget->GetNativeWindow()->parent());
 
@@ -211,7 +211,7 @@ TEST_F(ShellTest, CreateLockScreenModalWindow) {
 
   // It should be in non-LockScreen modal container.
   aura::Window* modal_container = Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_ModalContainer);
+      ash::internal::kShellWindowId_ModalContainer);
   EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent());
 
   modal_widget->Close();
@@ -242,8 +242,8 @@ TEST_F(ShellTest, IsScreenLocked) {
 
   // A lock screen window locks the screen.
   views::Widget* lock_widget = CreateTestWindow(widget_params);
-  aura_shell::Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LockScreenContainer)->
+  ash::Shell::GetInstance()->GetContainer(
+      ash::internal::kShellWindowId_LockScreenContainer)->
       AddChild(lock_widget->GetNativeView());
   lock_widget->Show();
   EXPECT_TRUE(Shell::GetInstance()->IsScreenLocked());
@@ -284,9 +284,9 @@ TEST_F(ShellTest, DefaultToCompactWindowMode) {
 
   // Even for a small screen, the user can force normal mode.
   monitor_size.SetSize(800, 600);
-  command_line.AppendSwitchASCII(aura_shell::switches::kAuraWindowMode,
-                                 aura_shell::switches::kAuraWindowModeNormal);
+  command_line.AppendSwitchASCII(ash::switches::kAuraWindowMode,
+                                 ash::switches::kAuraWindowModeNormal);
   EXPECT_FALSE(shell->DefaultToCompactWindowMode(monitor_size, &command_line));
 }
 
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/shell_window_ids.h b/ash/shell_window_ids.h
index 746d178..25bc085 100644
--- a/ash/shell_window_ids.h
+++ b/ash/shell_window_ids.h
@@ -8,7 +8,7 @@
 
 // Declarations of ids of special shell windows.
 
-namespace aura_shell {
+namespace ash {
 
 namespace internal {
 
@@ -41,7 +41,7 @@ const int kShellWindowId_MenusAndTooltipsContainer = 8;
 
 }  // namespace internal
 
-}  // namespace aura_shell
+}  // namespace ash
 
 
 #endif  // ASH_SHELL_WINDOW_IDS_H_
diff --git a/ash/status_area/status_area_view.cc b/ash/status_area/status_area_view.cc
index 937ac58..c98cf9eb 100644
--- a/ash/status_area/status_area_view.cc
+++ b/ash/status_area/status_area_view.cc
@@ -14,7 +14,7 @@
 #include "ui/gfx/canvas.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 StatusAreaView::StatusAreaView()
@@ -39,7 +39,7 @@ ASH_EXPORT views::Widget* CreateStatusArea() {
   gfx::Size ps = status_area_view->GetPreferredSize();
   params.bounds = gfx::Rect(0, 0, ps.width(), ps.height());
   params.parent = Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_StatusContainer);
+      ash::internal::kShellWindowId_StatusContainer);
   params.delegate = status_area_view;
   params.transparent = true;
   widget->Init(params);
@@ -50,4 +50,4 @@ ASH_EXPORT views::Widget* CreateStatusArea() {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/status_area/status_area_view.h b/ash/status_area/status_area_view.h
index 7e7f8dc..e7788a1 100644
--- a/ash/status_area/status_area_view.h
+++ b/ash/status_area/status_area_view.h
@@ -9,7 +9,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/views/widget/widget_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 class StatusAreaView : public views::WidgetDelegateView {
@@ -29,6 +29,6 @@ class StatusAreaView : public views::WidgetDelegateView {
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_STATUS_AREA_STATUS_AREA_VIEW_H_
diff --git a/ash/test/ash_unittests.cc b/ash/test/ash_unittests.cc
index ad39e19..7602d9a 100644
--- a/ash/test/ash_unittests.cc
+++ b/ash/test/ash_unittests.cc
@@ -5,5 +5,5 @@
 #include "ash/test/test_suite.h"
 
 int main(int argc, char** argv) {
-  return aura_shell::test::AuraShellTestSuite(argc, argv).Run();
+  return ash::test::AuraShellTestSuite(argc, argv).Run();
 }
diff --git a/ash/test/aura_shell_test_base.cc b/ash/test/aura_shell_test_base.cc
index 6b99331..b6011de 100644
--- a/ash/test/aura_shell_test_base.cc
+++ b/ash/test/aura_shell_test_base.cc
@@ -7,7 +7,7 @@
 #include "ash/shell.h"
 #include "ash/test/test_shell_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 AuraShellTestBase::AuraShellTestBase() {
@@ -20,7 +20,7 @@ void AuraShellTestBase::SetUp() {
   aura::test::AuraTestBase::SetUp();
 
   // Creates Shell and hook with Desktop.
-  aura_shell::Shell::CreateInstance(new TestShellDelegate);
+  ash::Shell::CreateInstance(new TestShellDelegate);
 }
 
 void AuraShellTestBase::TearDown() {
@@ -28,10 +28,10 @@ void AuraShellTestBase::TearDown() {
   RunAllPendingInMessageLoop();
 
   // Tear down the shell.
-  aura_shell::Shell::DeleteInstance();
+  ash::Shell::DeleteInstance();
 
   aura::test::AuraTestBase::TearDown();
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/test/aura_shell_test_base.h b/ash/test/aura_shell_test_base.h
index 92cb9ca..4084875 100644
--- a/ash/test/aura_shell_test_base.h
+++ b/ash/test/aura_shell_test_base.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "ui/aura/test/aura_test_base.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 class AuraShellTestBase : public aura::test::AuraTestBase {
@@ -26,6 +26,6 @@ class AuraShellTestBase : public aura::test::AuraTestBase {
 };
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_TEST_AURA_SHELL_TEST_BASE_H_
diff --git a/ash/test/test_activation_delegate.cc b/ash/test/test_activation_delegate.cc
index e92223a..44e6be5 100644
--- a/ash/test/test_activation_delegate.cc
+++ b/ash/test/test_activation_delegate.cc
@@ -8,7 +8,7 @@
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -50,4 +50,4 @@ void TestActivationDelegate::OnLostActive() {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/test/test_activation_delegate.h b/ash/test/test_activation_delegate.h
index d799745..3c543a7 100644
--- a/ash/test/test_activation_delegate.h
+++ b/ash/test/test_activation_delegate.h
@@ -14,7 +14,7 @@ namespace aura {
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 // A test ActivationDelegate that can be used to track activation changes for
@@ -54,6 +54,6 @@ class TestActivationDelegate : public aura::client::ActivationDelegate {
 };
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index eb289f4..3da311a 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -4,7 +4,7 @@
 
 #include "ash/test/test_shell_delegate.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 TestShellDelegate::TestShellDelegate() {
@@ -40,4 +40,4 @@ bool TestShellDelegate::ConfigureLauncherItem(LauncherItem* item) {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 1acc6a0..7b20e98 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -9,7 +9,7 @@
 #include "ash/shell_delegate.h"
 #include "base/compiler_specific.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 class TestShellDelegate : public ShellDelegate {
@@ -30,6 +30,6 @@ class TestShellDelegate : public ShellDelegate {
 };
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_TEST_TEST_SHELL_DELEGATE_H_
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
index eb22a6b..f3ebe9b 100644
--- a/ash/test/test_suite.cc
+++ b/ash/test/test_suite.cc
@@ -18,7 +18,7 @@
 #include "ui/gfx/test/gfx_test_utils.h"
 #endif
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv)
@@ -49,4 +49,4 @@ void AuraShellTestSuite::Shutdown() {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/test/test_suite.h b/ash/test/test_suite.h
index 5a32b69..bc7c5a0 100644
--- a/ash/test/test_suite.h
+++ b/ash/test/test_suite.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/test/test_suite.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 class AuraShellTestSuite : public base::TestSuite {
@@ -23,6 +23,6 @@ class AuraShellTestSuite : public base::TestSuite {
 };
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_TEST_TEST_SUITE_H_
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc
index 661d04c..78d3475 100644
--- a/ash/tooltips/tooltip_controller.cc
+++ b/ash/tooltips/tooltip_controller.cc
@@ -121,7 +121,7 @@ views::Widget* CreateTooltip() {
 
 }  // namespace
 
-namespace aura_shell {
+namespace ash {
 namespace internal {
 
 // Displays a widget with tooltip using a views::Label.
@@ -293,4 +293,4 @@ void TooltipController::UpdateIfRequired() {
 }
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
diff --git a/ash/tooltips/tooltip_controller.h b/ash/tooltips/tooltip_controller.h
index 5ab55d64..2d1eb34 100644
--- a/ash/tooltips/tooltip_controller.h
+++ b/ash/tooltips/tooltip_controller.h
@@ -22,7 +22,7 @@ class TouchEvent;
 class Window;
 }
 
-namespace aura_shell {
+namespace ash {
 
 namespace test {
 class TooltipControllerTest;
@@ -53,7 +53,7 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient,
   virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
 
  private:
-  friend class aura_shell::test::TooltipControllerTest;
+  friend class ash::test::TooltipControllerTest;
 
   class Tooltip;
 
@@ -75,6 +75,6 @@ class ASH_EXPORT TooltipController : public aura::client::TooltipClient,
 };
 
 }  // namespace internal
-}  // namespace aura_shell
+}  // namespace ash
 
 #endif  // ASH_TOOLTIPS_TOOLTIP_CONTROLLER_H_
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc
index 8ac5937..2392a85 100644
--- a/ash/tooltips/tooltip_controller_unittest.cc
+++ b/ash/tooltips/tooltip_controller_unittest.cc
@@ -12,7 +12,7 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
-namespace aura_shell {
+namespace ash {
 namespace test {
 
 namespace {
@@ -64,8 +64,8 @@ void AddViewToWidgetAndResize(views::Widget* widget, views::View* view) {
   widget->SetBounds(contents_view_bounds);
 }
 
-aura_shell::internal::TooltipController* GetController() {
-  return static_cast<aura_shell::internal::TooltipController*>(
+ash::internal::TooltipController* GetController() {
+  return static_cast<ash::internal::TooltipController*>(
       aura::client::GetTooltipClient());
 }
 
@@ -176,4 +176,4 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {
 }
 
 }  // namespace test
-}  // namespace aura_shell
+}  // namespace ash
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
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 6dfdf46..9e53cbb 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -79,8 +79,8 @@ const Experiment::Choice kPrerenderFromOmniboxChoices[] = {
 const Experiment::Choice kAuraWindowModeChoices[] = {
   { IDS_FLAGS_AURA_WINDOW_MODE_NORMAL, "", "" },
   { IDS_FLAGS_AURA_WINDOW_MODE_COMPACT,
-      aura_shell::switches::kAuraWindowMode,
-      aura_shell::switches::kAuraWindowModeCompact }
+      ash::switches::kAuraWindowMode,
+      ash::switches::kAuraWindowModeCompact }
 };
 #endif
 
@@ -468,14 +468,14 @@ const Experiment kExperiments[] = {
     IDS_FLAGS_AURA_WORKSPACE_MANAGER_NAME,
     IDS_FLAGS_AURA_WORKSPACE_MANAGER_DESCRIPTION,
     kOsWin | kOsLinux | kOsCrOS,
-    SINGLE_VALUE_TYPE(aura_shell::switches::kAuraWorkspaceManager)
+    SINGLE_VALUE_TYPE(ash::switches::kAuraWorkspaceManager)
   },
   {
     "aura-translucent-frames",
     IDS_FLAGS_AURA_TRANSLUCENT_FRAMES_NAME,
     IDS_FLAGS_AURA_TRANSLUCENT_FRAMES_DESCRIPTION,
     kOsWin | kOsLinux | kOsCrOS,
-    SINGLE_VALUE_TYPE(aura_shell::switches::kAuraTranslucentFrames)
+    SINGLE_VALUE_TYPE(ash::switches::kAuraTranslucentFrames)
   },
 #endif  // defined(USE_AURA)
   {
diff --git a/chrome/browser/automation/testing_automation_provider_aura.cc b/chrome/browser/automation/testing_automation_provider_aura.cc
index 2a5f3d1..ef99e17 100644
--- a/chrome/browser/automation/testing_automation_provider_aura.cc
+++ b/chrome/browser/automation/testing_automation_provider_aura.cc
@@ -14,7 +14,7 @@
 void TestingAutomationProvider::ActivateWindow(int handle) {
   aura::Window* window = window_tracker_->GetResource(handle);
   if (window) {
-    aura_shell::ActivateWindow(window);
+    ash::ActivateWindow(window);
   }
 }
 
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
index efbcec6..fca6812 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/chrome_browser_main_extra_parts_aura.cc
@@ -42,17 +42,15 @@ void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
 #endif
 
   // Shell takes ownership of ChromeShellDelegate.
-  aura_shell::Shell* aura_shell =
-      aura_shell::Shell::CreateInstance(new ChromeShellDelegate);
-  // accelerator controller takes ownership of ScreenshotDelegate.
-  aura_shell->accelerator_controller()->SetScreenshotDelegate(
-      new ScreenshotTaker);
+  ash::Shell* shell = ash::Shell::CreateInstance(new ChromeShellDelegate);
+  // AcceleratorController takes ownership of ScreenshotDelegate.
+  shell->accelerator_controller()->SetScreenshotDelegate(new ScreenshotTaker);
 
   // Make sure the singleton ScreenOrientationListener object is created.
   ScreenOrientationListener::GetInstance();
 }
 
 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
-  aura_shell::Shell::DeleteInstance();
+  ash::Shell::DeleteInstance();
   aura::RootWindow::DeleteInstance();
 }
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index c366189..1043798 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -322,7 +322,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
         SetScreenMode(chromeos::StatusAreaViewChromeos::LOGIN_MODE_WEBUI);
   }
 
-  // In Aura builds this will initialize aura_shell::Shell.
+  // In Aura builds this will initialize ash::Shell.
   ChromeBrowserMainPartsLinux::PreProfileInit();
 }
 
diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc
index 3f8bf0f..db63e9a 100644
--- a/chrome/browser/chromeos/login/base_login_display_host.cc
+++ b/chrome/browser/chromeos/login/base_login_display_host.cc
@@ -303,8 +303,8 @@ void BaseLoginDisplayHost::StartAnimation() {
     background_transition->AddElement(background_pause.release());
     background_transition->AddElement(background_transform_animation.release());
     ui::Layer* background_layer =
-        aura_shell::Shell::GetInstance()->GetContainer(
-            aura_shell::internal::kShellWindowId_DesktopBackgroundContainer)->
+        ash::Shell::GetInstance()->GetContainer(
+            ash::internal::kShellWindowId_DesktopBackgroundContainer)->
             layer();
     background_layer->GetAnimator()->StartAnimation(
         background_transition.release());
@@ -332,8 +332,8 @@ void BaseLoginDisplayHost::StartAnimation() {
     browser_transition->AddElement(browser_pause_animation.release());
     browser_transition->AddElement(browser_opacity_animation.release());
     ui::Layer* default_container_layer =
-        aura_shell::Shell::GetInstance()->GetContainer(
-            aura_shell::internal::kShellWindowId_DefaultContainer)->layer();
+        ash::Shell::GetInstance()->GetContainer(
+            ash::internal::kShellWindowId_DefaultContainer)->layer();
     default_container_layer->GetAnimator()->StartAnimation(
         browser_transition.release());
   }
diff --git a/chrome/browser/chromeos/login/lock_window_aura.cc b/chrome/browser/chromeos/login/lock_window_aura.cc
index 646bc31..4fc1188 100644
--- a/chrome/browser/chromeos/login/lock_window_aura.cc
+++ b/chrome/browser/chromeos/login/lock_window_aura.cc
@@ -44,8 +44,8 @@ void LockWindowAura::Init() {
   views::Widget::Init(params);
   // TODO(flackr): Use a property to specify this container rather than
   // depending on shell implementation.
-  aura_shell::Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_LockScreenContainer)->
+  ash::Shell::GetInstance()->GetContainer(
+      ash::internal::kShellWindowId_LockScreenContainer)->
       AddChild(GetNativeView());
 }
 
diff --git a/chrome/browser/chromeos/login/webui_login_display_host.cc b/chrome/browser/chromeos/login/webui_login_display_host.cc
index e7b9807..b3b450d 100644
--- a/chrome/browser/chromeos/login/webui_login_display_host.cc
+++ b/chrome/browser/chromeos/login/webui_login_display_host.cc
@@ -134,8 +134,8 @@ void WebUILoginDisplayHost::LoadURL(const GURL& url) {
     login_view_->Init(login_window_);
 
 #if defined(USE_AURA)
-    aura_shell::Shell::GetInstance()->GetContainer(
-        aura_shell::internal::kShellWindowId_LockScreenContainer)->
+    ash::Shell::GetInstance()->GetContainer(
+        ash::internal::kShellWindowId_LockScreenContainer)->
         AddChild(login_window_->GetNativeView());
 #endif
 
diff --git a/chrome/browser/platform_util_aura.cc b/chrome/browser/platform_util_aura.cc
index e5cae2e..d2cb2bf 100644
--- a/chrome/browser/platform_util_aura.cc
+++ b/chrome/browser/platform_util_aura.cc
@@ -19,11 +19,11 @@ gfx::NativeView GetParent(gfx::NativeView view) {
 }
 
 bool IsWindowActive(gfx::NativeWindow window) {
-  return aura_shell::IsActiveWindow(window);
+  return ash::IsActiveWindow(window);
 }
 
 void ActivateWindow(gfx::NativeWindow window) {
-  aura_shell::ActivateWindow(window);
+  ash::ActivateWindow(window);
 }
 
 bool IsVisible(gfx::NativeView view) {
diff --git a/chrome/browser/ui/views/aura/app_list/app_list_model_builder.cc b/chrome/browser/ui/views/aura/app_list/app_list_model_builder.cc
index 98c62e6..9ada58d 100644
--- a/chrome/browser/ui/views/aura/app_list/app_list_model_builder.cc
+++ b/chrome/browser/ui/views/aura/app_list/app_list_model_builder.cc
@@ -23,18 +23,18 @@ namespace {
 
 // Gets or creates group for given |extension| in |model|. The created group
 // is added to |model| and owned by it.
-aura_shell::AppListItemGroupModel* GetOrCreateGroup(
+ash::AppListItemGroupModel* GetOrCreateGroup(
     int page_index,
     const ListValue* app_page_names,
-    aura_shell::AppListModel* model) {
+    ash::AppListModel* model) {
   if (page_index >= model->group_count()) {
     for (int i = model->group_count(); i <= page_index; ++i) {
       std::string title;
       if (!app_page_names->GetString(i, &title))
         title = l10n_util::GetStringUTF8(IDS_APP_DEFAULT_PAGE_NAME);
 
-      aura_shell::AppListItemGroupModel* group =
-          new aura_shell::AppListItemGroupModel(title);
+      ash::AppListItemGroupModel* group =
+          new ash::AppListItemGroupModel(title);
       model->AddGroup(group);
     }
   }
@@ -52,7 +52,7 @@ bool ExtensionAppPrecedes(const ExtensionAppItem* a,
 }  // namespace
 
 AppListModelBuilder::AppListModelBuilder(Profile* profile,
-                                         aura_shell::AppListModel* model)
+                                         ash::AppListModel* model)
     : profile_(profile),
       model_(model) {
 }
@@ -91,7 +91,7 @@ void AppListModelBuilder::GetExtensionApps() {
   for (size_t i = 0; i < items.size(); ++i) {
     ExtensionAppItem* item = items[i];
 
-    aura_shell::AppListItemGroupModel* group = GetOrCreateGroup(
+    ash::AppListItemGroupModel* group = GetOrCreateGroup(
         item->page_index(),
         app_page_names,
         model_);
@@ -107,8 +107,8 @@ void AppListModelBuilder::GetBrowserCommands() {
 
   // Uses the first group to put browser commands
   if (model_->group_count() == 0)
-    model_->AddGroup(new aura_shell::AppListItemGroupModel(""));
-  aura_shell::AppListItemGroupModel* group = model_->GetGroup(0);
+    model_->AddGroup(new ash::AppListItemGroupModel(""));
+  ash::AppListItemGroupModel* group = model_->GetGroup(0);
 
   group->AddItem(new BrowserCommandItem(browser,
                                         IDC_NEW_INCOGNITO_WINDOW,
diff --git a/chrome/browser/ui/views/aura/app_list/app_list_model_builder.h b/chrome/browser/ui/views/aura/app_list/app_list_model_builder.h
index 1032d73..f9525eb 100644
--- a/chrome/browser/ui/views/aura/app_list/app_list_model_builder.h
+++ b/chrome/browser/ui/views/aura/app_list/app_list_model_builder.h
@@ -13,7 +13,7 @@ class Profile;
 
 class AppListModelBuilder {
  public:
-  AppListModelBuilder(Profile* profile, aura_shell::AppListModel* model);
+  AppListModelBuilder(Profile* profile, ash::AppListModel* model);
   virtual ~AppListModelBuilder();
 
   // Populates the model.
@@ -26,7 +26,7 @@ class AppListModelBuilder {
   void GetBrowserCommands();
 
   Profile* profile_;
-  aura_shell::AppListModel* model_;
+  ash::AppListModel* model_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListModelBuilder);
 };
diff --git a/chrome/browser/ui/views/aura/app_list/app_list_model_builder_unittest.cc b/chrome/browser/ui/views/aura/app_list/app_list_model_builder_unittest.cc
index 1dfd1e5..c113776 100644
--- a/chrome/browser/ui/views/aura/app_list/app_list_model_builder_unittest.cc
+++ b/chrome/browser/ui/views/aura/app_list/app_list_model_builder_unittest.cc
@@ -33,7 +33,7 @@ TEST_F(AppListModelBuilderTest, GetExtensionApps) {
   const ExtensionSet* extensions = service_->extensions();
   ASSERT_EQ(static_cast<size_t>(4),  extensions->size());
 
-  scoped_ptr<aura_shell::AppListModel> model(new aura_shell::AppListModel());
+  scoped_ptr<ash::AppListModel> model(new ash::AppListModel());
   AppListModelBuilder builder(profile_.get(), model.get());
   builder.GetExtensionApps();
 
@@ -41,10 +41,10 @@ TEST_F(AppListModelBuilderTest, GetExtensionApps) {
   EXPECT_EQ(2, model->group_count());
 
   // Two packaged apps are on the first page and hosted app on the 2nd page.
-  aura_shell::AppListItemGroupModel* group1 = model->GetGroup(0);
+  ash::AppListItemGroupModel* group1 = model->GetGroup(0);
   EXPECT_EQ("Packaged App 1", group1->GetItem(0)->title());
   EXPECT_EQ("Packaged App 2", group1->GetItem(1)->title());
 
-  aura_shell::AppListItemGroupModel* group2 = model->GetGroup(1);
+  ash::AppListItemGroupModel* group2 = model->GetGroup(1);
   EXPECT_EQ("Hosted App", group2->GetItem(0)->title());
 }
diff --git a/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.cc b/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.cc
index c624778..cf22244 100644
--- a/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.cc
@@ -13,7 +13,7 @@ AppListViewDelegate::~AppListViewDelegate() {
 }
 
 void AppListViewDelegate::OnAppListItemActivated(
-    aura_shell::AppListItemModel* item,
+    ash::AppListItemModel* item,
     int event_flags) {
   static_cast<ChromeAppListItem*>(item)->Activate(event_flags);
 }
diff --git a/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.h b/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.h
index 6b5f4a3..452633b 100644
--- a/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.h
+++ b/chrome/browser/ui/views/aura/app_list/app_list_view_delegate.h
@@ -10,14 +10,14 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 
-class AppListViewDelegate : public aura_shell::AppListViewDelegate {
+class AppListViewDelegate : public ash::AppListViewDelegate {
  public:
   AppListViewDelegate();
   virtual ~AppListViewDelegate();
 
  private:
-  // Overridden from aura_shell::AppListViewDelegate:
-  virtual void OnAppListItemActivated(aura_shell::AppListItemModel* item,
+  // Overridden from ash::AppListViewDelegate:
+  virtual void OnAppListItemActivated(ash::AppListItemModel* item,
                                       int event_flags) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(AppListViewDelegate);
diff --git a/chrome/browser/ui/views/aura/app_list/chrome_app_list_item.h b/chrome/browser/ui/views/aura/app_list/chrome_app_list_item.h
index ed53228..778e2a4 100644
--- a/chrome/browser/ui/views/aura/app_list/chrome_app_list_item.h
+++ b/chrome/browser/ui/views/aura/app_list/chrome_app_list_item.h
@@ -11,7 +11,7 @@
 // Base class of all chrome app list items. Chrome's AppListViewDelegate assumes
 // all items are derived from this class and calls Activate when an item is
 // activated.
-class ChromeAppListItem : public aura_shell::AppListItemModel {
+class ChromeAppListItem : public ash::AppListItemModel {
  public:
   // Activates the item. |event_flags| holds flags of a mouse/keyboard event
   // associated with this activation.
diff --git a/chrome/browser/ui/views/aura/app_list/extension_app_item.cc b/chrome/browser/ui/views/aura/app_list/extension_app_item.cc
index c8f9497..1a431e7 100644
--- a/chrome/browser/ui/views/aura/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/views/aura/app_list/extension_app_item.cc
@@ -84,7 +84,7 @@ const Extension* ExtensionAppItem::GetExtension() const {
 
 void ExtensionAppItem::LoadImage(const Extension* extension) {
   ExtensionResource icon = extension->GetIconResource(
-      aura_shell::AppListItemView::kIconSize,
+      ash::AppListItemView::kIconSize,
       ExtensionIconSet::MATCH_BIGGER);
   if (icon.relative_path().empty()) {
     LoadDefaultImage();
@@ -122,8 +122,8 @@ void ExtensionAppItem::LoadImage(const Extension* extension) {
   tracker_.reset(new ImageLoadingTracker(this));
   tracker_->LoadImage(extension,
                       icon,
-                      gfx::Size(aura_shell::AppListItemView::kIconSize,
-                                aura_shell::AppListItemView::kIconSize),
+                      gfx::Size(ash::AppListItemView::kIconSize,
+                                ash::AppListItemView::kIconSize),
                       ImageLoadingTracker::DONT_CACHE);
 }
 
diff --git a/chrome/browser/ui/views/aura/app_list_window.cc b/chrome/browser/ui/views/aura/app_list_window.cc
index dbae24c..e9fd69f 100644
--- a/chrome/browser/ui/views/aura/app_list_window.cc
+++ b/chrome/browser/ui/views/aura/app_list_window.cc
@@ -15,7 +15,7 @@
 #include "ui/views/widget/widget.h"
 
 AppListWindow::AppListWindow(const gfx::Rect& bounds,
-    const aura_shell::ShellDelegate::SetWidgetCallback& callback)
+    const ash::ShellDelegate::SetWidgetCallback& callback)
     : widget_(NULL),
       contents_(NULL),
       callback_(callback),
@@ -80,7 +80,7 @@ void AppListWindow::OnTabMainFrameFirstRender() {
 
 void AppListWindow::Close() {
   // We should be visible when running here and toggle actually closes us.
-  aura_shell::Shell::GetInstance()->ToggleAppList();
+  ash::Shell::GetInstance()->ToggleAppList();
 }
 
 void AppListWindow::OnAppsLoaded() {
diff --git a/chrome/browser/ui/views/aura/app_list_window.h b/chrome/browser/ui/views/aura/app_list_window.h
index 825cd8a..f02b489 100644
--- a/chrome/browser/ui/views/aura/app_list_window.h
+++ b/chrome/browser/ui/views/aura/app_list_window.h
@@ -26,7 +26,7 @@ class AppListWindow : public views::WidgetDelegate,
  public:
   AppListWindow(
       const gfx::Rect& bounds,
-      const aura_shell::ShellDelegate::SetWidgetCallback& callback);
+      const ash::ShellDelegate::SetWidgetCallback& callback);
 
  private:
   virtual ~AppListWindow();
@@ -66,7 +66,7 @@ class AppListWindow : public views::WidgetDelegate,
   scoped_ptr<TabFirstRenderWatcher> tab_watcher_;
 
   // Callback to set app list widget when it's ready.
-  aura_shell::ShellDelegate::SetWidgetCallback callback_;
+  ash::ShellDelegate::SetWidgetCallback callback_;
 
   // True if webui is rendered.
   bool content_rendered_;
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
index 96d7601..e3de884 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
@@ -34,13 +34,13 @@ StatusAreaView* ChromeShellDelegate::GetStatusArea() {
 // static
 bool ChromeShellDelegate::ShouldCreateLauncherItemForBrowser(
     Browser* browser,
-    aura_shell::LauncherItemType* type) {
+    ash::LauncherItemType* type) {
   if (browser->type() == Browser::TYPE_TABBED) {
-    *type = aura_shell::TYPE_TABBED;
+    *type = ash::TYPE_TABBED;
     return true;
   }
   if (browser->is_app()) {
-    *type = aura_shell::TYPE_APP;
+    *type = ash::TYPE_APP;
     return true;
   }
   return false;
@@ -66,25 +66,25 @@ void ChromeShellDelegate::RequestAppListWidget(
   new AppListWindow(bounds, callback);
 }
 
-void ChromeShellDelegate::BuildAppListModel(aura_shell::AppListModel* model) {
+void ChromeShellDelegate::BuildAppListModel(ash::AppListModel* model) {
   AppListModelBuilder builder(ProfileManager::GetDefaultProfile(),
                               model);
   builder.Build();
 }
 
-aura_shell::AppListViewDelegate*
+ash::AppListViewDelegate*
 ChromeShellDelegate::CreateAppListViewDelegate() {
   // Shell will own the created delegate.
   return new AppListViewDelegate;
 }
 
 void ChromeShellDelegate::LauncherItemClicked(
-    const aura_shell::LauncherItem& item) {
-  aura_shell::ActivateWindow(item.window);
+    const ash::LauncherItem& item) {
+  ash::ActivateWindow(item.window);
 }
 
 bool ChromeShellDelegate::ConfigureLauncherItem(
-    aura_shell::LauncherItem* item) {
+    ash::LauncherItem* item) {
   BrowserView* view = BrowserView::GetBrowserViewForNativeWindow(item->window);
   return view &&
       ShouldCreateLauncherItemForBrowser(view->browser(), &(item->type));
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.h b/chrome/browser/ui/views/aura/chrome_shell_delegate.h
index 020397e..a0cd6d7 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.h
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.h
@@ -20,7 +20,7 @@ namespace views {
 class View;
 }
 
-class ChromeShellDelegate : public aura_shell::ShellDelegate {
+class ChromeShellDelegate : public ash::ShellDelegate {
  public:
   ChromeShellDelegate();
   virtual ~ChromeShellDelegate();
@@ -33,19 +33,19 @@ class ChromeShellDelegate : public aura_shell::ShellDelegate {
   // should be created |type| is set to the launcher type to create.
   static bool ShouldCreateLauncherItemForBrowser(
       Browser* browser,
-      aura_shell::LauncherItemType* type);
+      ash::LauncherItemType* type);
 
-  // aura_shell::ShellDelegate overrides;
+  // ash::ShellDelegate overrides;
   virtual void CreateNewWindow() OVERRIDE;
   virtual views::Widget* CreateStatusArea() OVERRIDE;
   virtual void RequestAppListWidget(
       const gfx::Rect& bounds,
       const SetWidgetCallback& callback) OVERRIDE;
-  virtual void BuildAppListModel(aura_shell::AppListModel* model) OVERRIDE;
-  virtual aura_shell::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
+  virtual void BuildAppListModel(ash::AppListModel* model) OVERRIDE;
+  virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
   virtual void LauncherItemClicked(
-      const aura_shell::LauncherItem& item) OVERRIDE;
-  virtual bool ConfigureLauncherItem(aura_shell::LauncherItem* item) OVERRIDE;
+      const ash::LauncherItem& item) OVERRIDE;
+  virtual bool ConfigureLauncherItem(ash::LauncherItem* item) OVERRIDE;
 
  private:
   static ChromeShellDelegate* instance_;
diff --git a/chrome/browser/ui/views/aura/launcher_icon_updater.cc b/chrome/browser/ui/views/aura/launcher_icon_updater.cc
index 8739e78..67ac014 100644
--- a/chrome/browser/ui/views/aura/launcher_icon_updater.cc
+++ b/chrome/browser/ui/views/aura/launcher_icon_updater.cc
@@ -15,7 +15,7 @@
 
 LauncherIconUpdater::LauncherIconUpdater(
     TabStripModel* tab_model,
-    aura_shell::LauncherModel* launcher_model,
+    ash::LauncherModel* launcher_model,
     aura::Window* window)
     : tab_model_(tab_model),
       launcher_model_(launcher_model),
@@ -67,7 +67,7 @@ void LauncherIconUpdater::UpdateLauncher(TabContentsWrapper* tab) {
   if (item_index == -1)
     return;
 
-  if (launcher_model_->items()[item_index].type == aura_shell::TYPE_APP) {
+  if (launcher_model_->items()[item_index].type == ash::TYPE_APP) {
     // Use the app icon if we can.
     SkBitmap image;
     if (tab->extension_tab_helper()->GetExtensionAppIcon())
@@ -78,7 +78,7 @@ void LauncherIconUpdater::UpdateLauncher(TabContentsWrapper* tab) {
     return;
   }
 
-  aura_shell::LauncherTabbedImages images;
+  ash::LauncherTabbedImages images;
   if (tab->favicon_tab_helper()->ShouldDisplayFavicon()) {
     images.resize(1);
     images[0].image = tab->favicon_tab_helper()->GetFavicon();
diff --git a/chrome/browser/ui/views/aura/launcher_icon_updater.h b/chrome/browser/ui/views/aura/launcher_icon_updater.h
index 0176e2e..2180be3 100644
--- a/chrome/browser/ui/views/aura/launcher_icon_updater.h
+++ b/chrome/browser/ui/views/aura/launcher_icon_updater.h
@@ -15,7 +15,7 @@ class TabContentsWrapper;
 namespace aura {
 class Window;
 }
-namespace aura_shell {
+namespace ash {
 class LauncherModel;
 }
 
@@ -24,7 +24,7 @@ class LauncherModel;
 class LauncherIconUpdater : public TabStripModelObserver {
  public:
   LauncherIconUpdater(TabStripModel* tab_model,
-                      aura_shell::LauncherModel* launcher_model,
+                      ash::LauncherModel* launcher_model,
                       aura::Window* window);
   virtual ~LauncherIconUpdater();
 
@@ -44,7 +44,7 @@ class LauncherIconUpdater : public TabStripModelObserver {
 
   TabStripModel* tab_model_;
 
-  aura_shell::LauncherModel* launcher_model_;
+  ash::LauncherModel* launcher_model_;
 
   // Used to index into the model.
   aura::Window* window_;
diff --git a/chrome/browser/ui/views/aura/screenshot_taker.h b/chrome/browser/ui/views/aura/screenshot_taker.h
index 5354f17..3aa3ec4 100644
--- a/chrome/browser/ui/views/aura/screenshot_taker.h
+++ b/chrome/browser/ui/views/aura/screenshot_taker.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 
-class ScreenshotTaker : public aura_shell::ScreenshotDelegate {
+class ScreenshotTaker : public ash::ScreenshotDelegate {
  public:
   ScreenshotTaker();
 
diff --git a/chrome/browser/ui/views/aura/status_area_host_aura.cc b/chrome/browser/ui/views/aura/status_area_host_aura.cc
index e0579cf..4bf6d07 100644
--- a/chrome/browser/ui/views/aura/status_area_host_aura.cc
+++ b/chrome/browser/ui/views/aura/status_area_host_aura.cc
@@ -39,9 +39,9 @@ StatusAreaView* StatusAreaHostAura::GetStatusArea() {
 }
 
 views::Widget* StatusAreaHostAura::CreateStatusArea() {
-  aura_shell::Shell* aura_shell = aura_shell::Shell::GetInstance();
-  aura::Window* status_window = aura_shell->GetContainer(
-      aura_shell::internal::kShellWindowId_StatusContainer);
+  ash::Shell* shell = ash::Shell::GetInstance();
+  aura::Window* status_window = shell->GetContainer(
+      ash::internal::kShellWindowId_StatusContainer);
 
   // Create status area view.
   status_area_view_ = new StatusAreaView();
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index 9e91a52..c3473d9 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -66,10 +66,10 @@ void BrowserFrame::InitBrowserFrame() {
   }
 #if defined(USE_AURA)
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(aura_shell::switches::kAuraTranslucentFrames))
+  if (command_line->HasSwitch(ash::switches::kAuraTranslucentFrames))
     params.transparent = true;
   // Aura laptop mode fills the monitor with with its windows.
-  if (aura_shell::switches::IsAuraWindowModeCompact() &&
+  if (ash::switches::IsAuraWindowModeCompact() &&
       browser_view_->IsBrowserTypeNormal()) {
     params.bounds = gfx::Screen::GetPrimaryMonitorBounds();
     params.show_state = ui::SHOW_STATE_MAXIMIZED;
@@ -81,7 +81,7 @@ void BrowserFrame::InitBrowserFrame() {
   // to appear active.
   bool disable_inactive_rendering = false;
 #if defined(USE_AURA)
-  disable_inactive_rendering = aura_shell::switches::IsAuraWindowModeCompact();
+  disable_inactive_rendering = ash::switches::IsAuraWindowModeCompact();
 #elif defined(OS_CHROMEOS)
   disable_inactive_rendering = true;
 #endif
@@ -121,7 +121,7 @@ void BrowserFrame::TabStripDisplayModeChanged() {
 bool BrowserFrame::IsSingleWindowMode() const {
   bool single_window_mode = false;
 #if defined(USE_AURA)
-  single_window_mode = aura_shell::switches::IsAuraWindowModeCompact();
+  single_window_mode = ash::switches::IsAuraWindowModeCompact();
 #elif defined(OS_CHROMEOS)
   single_window_mode =
       chromeos::system::runtime_environment::IsRunningOnChromeOS();
diff --git a/chrome/browser/ui/views/frame/browser_frame_aura.cc b/chrome/browser/ui/views/frame/browser_frame_aura.cc
index 4616299..7cb1d05 100644
--- a/chrome/browser/ui/views/frame/browser_frame_aura.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_aura.cc
@@ -165,7 +165,7 @@ BrowserFrameAura::BrowserFrameAura(BrowserFrame* browser_frame,
       browser_view_(browser_view),
       browser_frame_(browser_frame) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(aura_shell::switches::kAuraTranslucentFrames)) {
+  if (command_line->HasSwitch(ash::switches::kAuraTranslucentFrames)) {
     // Aura paints layers behind this view, so this must be a layer also.
     // TODO: see if we can avoid this, layers are expensive.
     browser_view_->SetPaintToLayer(true);
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc
index fca13bd..3ece949 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc
@@ -246,8 +246,8 @@ BrowserNonClientFrameViewAura::BrowserNonClientFrameViewAura(
   // Associate our WindowFrame interface with our owning window/widget so
   // we get callbacks from aura_shell.
   frame->AsWidget()->SetNativeWindowProperty(
-      aura_shell::kWindowFrameKey,
-      static_cast<aura_shell::WindowFrame*>(this));
+      ash::kWindowFrameKey,
+      static_cast<ash::WindowFrame*>(this));
 }
 
 BrowserNonClientFrameViewAura::~BrowserNonClientFrameViewAura() {
@@ -569,7 +569,7 @@ void BrowserNonClientFrameViewAura::OnWidgetActivationChanged(
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// aura_shell::WindowFrame overrides:
+// ash::WindowFrame overrides:
 
 void BrowserNonClientFrameViewAura::OnWindowHoverChanged(bool hovered) {
   if (hovered) {
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h
index 371dd8d..4655c41 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h
@@ -20,7 +20,7 @@ class WindowControlButton;
 class BrowserNonClientFrameViewAura : public BrowserNonClientFrameView,
                                       public views::ButtonListener,
                                       public views::Widget::Observer,
-                                      public aura_shell::WindowFrame {
+                                      public ash::WindowFrame {
  public:
   BrowserNonClientFrameViewAura(BrowserFrame* frame, BrowserView* browser_view);
   virtual ~BrowserNonClientFrameViewAura();
@@ -77,7 +77,7 @@ class BrowserNonClientFrameViewAura : public BrowserNonClientFrameView,
   virtual void OnWidgetActivationChanged(views::Widget* widget,
                                          bool active) OVERRIDE;
 
-  // aura_shell::WindowFrame overrides:
+  // ash::WindowFrame overrides:
   virtual void OnWindowHoverChanged(bool hovered) OVERRIDE;
 
   int last_hittest_code_;
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
index 58f7d58..9f49f10 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
@@ -21,7 +21,7 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
         frame, static_cast<PanelBrowserView*>(browser_view));
   }
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(aura_shell::switches::kAuraTranslucentFrames))
+  if (command_line->HasSwitch(ash::switches::kAuraTranslucentFrames))
     return new BrowserNonClientFrameViewAura(frame, browser_view);
   return new OpaqueBrowserFrameView(frame, browser_view);
 }
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index d41f6c1..2c34dae 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1978,13 +1978,13 @@ void BrowserView::Init() {
 #if defined(USE_AURA)
   // Add launcher item if we're using the launcher and this type of browser
   // needs an item.
-  aura_shell::LauncherItemType type;
-  if (aura_shell::Shell::GetInstance()->launcher() &&
+  ash::LauncherItemType type;
+  if (ash::Shell::GetInstance()->launcher() &&
       ChromeShellDelegate::ShouldCreateLauncherItemForBrowser(browser_.get(),
                                                               &type)) {
     icon_updater_.reset(new LauncherIconUpdater(
         browser_->tabstrip_model(),
-        aura_shell::Shell::GetInstance()->launcher()->model(),
+        ash::Shell::GetInstance()->launcher()->model(),
         frame_->GetNativeWindow()));
   }
 #endif  // defined(USE_AURA)
diff --git a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc
index d80527f..fbe03da 100644
--- a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc
+++ b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc
@@ -185,8 +185,8 @@ KeyboardWidget::KeyboardWidget()
   params.bounds = GetKeyboardPosition(keyboard_height_);
   Init(params);
 #if defined(USE_AURA)
-  aura_shell::Shell::GetInstance()->GetContainer(
-      aura_shell::internal::kShellWindowId_MenusAndTooltipsContainer)->
+  ash::Shell::GetInstance()->GetContainer(
+      ash::internal::kShellWindowId_MenusAndTooltipsContainer)->
       AddChild(GetNativeView());
 #endif
 
diff --git a/chrome/test/base/chrome_render_view_host_test_harness.cc b/chrome/test/base/chrome_render_view_host_test_harness.cc
index c3819ab..8fdf55d 100644
--- a/chrome/test/base/chrome_render_view_host_test_harness.cc
+++ b/chrome/test/base/chrome_render_view_host_test_harness.cc
@@ -31,7 +31,7 @@ void ChromeRenderViewHostTestHarness::SetUp() {
 void ChromeRenderViewHostTestHarness::TearDown() {
   RenderViewHostTestHarness::TearDown();
 #if defined(USE_AURA)
-  aura_shell::Shell::DeleteInstance();
+  ash::Shell::DeleteInstance();
   aura::RootWindow::DeleteInstance();
 #endif
 }
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index 4b0f13f..97dbe79 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -92,7 +92,7 @@ void ViewEventTestBase::SetUp() {
   ui::CompositorTestSupport::Initialize();
 #if defined(USE_AURA)
   aura::RootWindow::GetInstance();
-  aura_shell::Shell::CreateInstance(NULL);
+  ash::Shell::CreateInstance(NULL);
 #endif
   window_ = views::Widget::CreateWindow(this);
 }
@@ -108,7 +108,7 @@ void ViewEventTestBase::TearDown() {
     window_ = NULL;
   }
 #if defined(USE_AURA)
-  aura_shell::Shell::DeleteInstance();
+  ash::Shell::DeleteInstance();
   aura::RootWindow::DeleteInstance();
 #endif
   ui::CompositorTestSupport::Terminate();