Rename Launcher to Shelf.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

 // Copyright 2013 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/ash/launcher/chrome_launcher_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
-#include "ash/launcher/launcher.h"
 #include "ash/multi_profile_uma.h"
 #include "ash/root_window_controller.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 371 matching lines @@
                               content::Source<Profile>(profile_));
 }
 
 ChromeLauncherController::~ChromeLauncherController() {
   // Reset the BrowserStatusMonitor as it has a weak pointer to this.
   browser_status_monitor_.reset();
 
   // Reset the shell window controller here since it has a weak pointer to this.
   shell_window_controller_.reset();
 
-  for (std::set<ash::Launcher*>::iterator iter = launchers_.begin();
-       iter != launchers_.end();
+  for (std::set<ash::Shelf*>::iterator iter = shelves_.begin();
+       iter != shelves_.end();
        ++iter)
     (*iter)->shelf_widget()->shelf_layout_manager()->RemoveObserver(this);
 
   model_->RemoveObserver(this);
   if (ash::Shell::HasInstance())
     ash::Shell::GetInstance()->display_controller()->RemoveObserver(this);
   for (IDToItemControllerMap::iterator i = id_to_item_controller_map_.begin();
        i != id_to_item_controller_map_.end(); ++i) {
     int index = model_->ItemIndexByID(i->first);
     // A "browser proxy" is not known to the model and this removal does
@@ skipping 679 matching lines @@
                     views::corewm::WINDOW_ANIMATION_TYPE_BOUNCE);
     } else {
       window->Minimize();
     }
   } else {
     window->Show();
     window->Activate();
   }
 }
 
-void ChromeLauncherController::OnLauncherCreated(ash::Launcher* launcher) {
-  launchers_.insert(launcher);
-  launcher->shelf_widget()->shelf_layout_manager()->AddObserver(this);
+void ChromeLauncherController::OnShelfCreated(ash::Shelf* shelf) {
+  shelves_.insert(shelf);
+  shelf->shelf_widget()->shelf_layout_manager()->AddObserver(this);
 }
 
-void ChromeLauncherController::OnLauncherDestroyed(ash::Launcher* launcher) {
-  launchers_.erase(launcher);
+void ChromeLauncherController::OnShelfDestroyed(ash::Shelf* shelf) {
+  shelves_.erase(shelf);
   // RemoveObserver is not called here, since by the time this method is called
-  // Launcher is already in its destructor.
+  // Shelf is already in its destructor.
 }
 
 void ChromeLauncherController::ShelfItemAdded(int index) {
   // The app list launcher can get added to the shelf after we applied the
   // preferences. In that case the item might be at the wrong spot. As such we
   // call the function again.
   if (model_->items()[index].type == ash::TYPE_APP_LIST &&
       ash::switches::UseAlternateShelfLayout())
     UpdateAppLaunchersFromPref();
 }
@@ skipping 890 matching lines @@
 }
 
 void ChromeLauncherController::ReleaseProfile() {
   if (app_sync_ui_state_)
     app_sync_ui_state_->RemoveObserver(this);
 
   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
 
   pref_change_registrar_.RemoveAll();
 }