Rename the aura_shell namespace to ash

chrome/browser/ui/views/aura/launcher_icon_updater.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/aura/launcher_icon_updater.h"
 
 #include "ash/launcher/launcher_model.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 
 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),
       window_(window) {
   tab_model->AddObserver(this);
   UpdateLauncher(tab_model_->GetActiveTabContents());
 }
 
 LauncherIconUpdater::~LauncherIconUpdater() {
   tab_model_->RemoveObserver(this);
@@ skipping 31 matching lines @@
 }
 
 void LauncherIconUpdater::UpdateLauncher(TabContentsWrapper* tab) {
   if (!tab)
     return;  // Assume the window is going to be closed if there are no tabs.
 
   int item_index = launcher_model_->ItemIndexByWindow(window_);
   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())
       image = *tab->extension_tab_helper()->GetExtensionAppIcon();
     else
       image = tab->favicon_tab_helper()->GetFavicon();
     launcher_model_->SetAppImage(item_index, image);
     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();
     if (images[0].image.empty()) {
         images[0].image = *ResourceBundle::GetSharedInstance().GetBitmapNamed(
             IDR_DEFAULT_FAVICON);
     }
     images[0].user_data = tab;
   }
   launcher_model_->SetTabbedImages(item_index, images);
 }