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

30 files changed, 86 insertions, 88 deletions

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