ash: Rename more Launcher classes to Shelf*.

ash/shelf/shelf_item_delegate_manager.cc

Index: ash/shelf/shelf_item_delegate_manager.cc
diff --git a/ash/launcher/launcher_item_delegate_manager.cc b/ash/shelf/shelf_item_delegate_manager.cc
similarity index 44%
rename from ash/launcher/launcher_item_delegate_manager.cc
rename to ash/shelf/shelf_item_delegate_manager.cc
index efd885717f646b9c754420939573392acd532698..79124caac15a4b2608e2924141eb899b82002c33 100644
--- a/ash/launcher/launcher_item_delegate_manager.cc
+++ b/ash/shelf/shelf_item_delegate_manager.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/launcher/launcher_item_delegate_manager.h"
+#include "ash/shelf/shelf_item_delegate_manager.h"
 
-#include "ash/launcher/launcher_item_delegate.h"
+#include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "base/logging.h"
@@ -12,59 +12,57 @@
 
 namespace ash {
 
-LauncherItemDelegateManager::LauncherItemDelegateManager(ShelfModel* model)
+ShelfItemDelegateManager::ShelfItemDelegateManager(ShelfModel* model)
     : model_(model) {
   DCHECK(model_);
   model_->AddObserver(this);
 }
 
-LauncherItemDelegateManager::~LauncherItemDelegateManager() {
+ShelfItemDelegateManager::~ShelfItemDelegateManager() {
   model_->RemoveObserver(this);
   STLDeleteContainerPairSecondPointers(id_to_item_delegate_map_.begin(),
                                        id_to_item_delegate_map_.end());
 }
 
-void LauncherItemDelegateManager::SetLauncherItemDelegate(
-    ash::LauncherID id,
-    scoped_ptr<LauncherItemDelegate> item_delegate) {
-  // If another LauncherItemDelegate is already registered for |id|, we assume
-  // that this request is replacing LauncherItemDelegate for |id| with
+void ShelfItemDelegateManager::SetShelfItemDelegate(
+    LauncherID id,
+    scoped_ptr<ShelfItemDelegate> item_delegate) {
+  // If another ShelfItemDelegate is already registered for |id|, we assume
+  // that this request is replacing ShelfItemDelegate for |id| with
   // |item_delegate|.
-  RemoveLauncherItemDelegate(id);
+  RemoveShelfItemDelegate(id);
   id_to_item_delegate_map_[id] = item_delegate.release();
 }
 
-LauncherItemDelegate* LauncherItemDelegateManager::GetLauncherItemDelegate(
-    ash::LauncherID id) {
+ShelfItemDelegate* ShelfItemDelegateManager::GetShelfItemDelegate(
+    LauncherID id) {
   if (model_->ItemIndexByID(id) != -1) {
-    // Each LauncherItem has to have a LauncherItemDelegate.
+    // Each LauncherItem has to have a ShelfItemDelegate.
     DCHECK(id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end());
     return id_to_item_delegate_map_[id];
   }
   return NULL;
 }
 
-void LauncherItemDelegateManager::ShelfItemAdded(int index) {
+void ShelfItemDelegateManager::ShelfItemAdded(int index) {
 }
 
-void LauncherItemDelegateManager::ShelfItemRemoved(int index, LauncherID id) {
-  RemoveLauncherItemDelegate(id);
+void ShelfItemDelegateManager::ShelfItemRemoved(int index, LauncherID id) {
+  RemoveShelfItemDelegate(id);
 }
 
-void LauncherItemDelegateManager::ShelfItemMoved(int start_index,
-                                                 int target_index) {
+void ShelfItemDelegateManager::ShelfItemMoved(int start_index,
+                                              int target_index) {
 }
 
-void LauncherItemDelegateManager::ShelfItemChanged(
-    int index,
-    const LauncherItem& old_item) {
+void ShelfItemDelegateManager::ShelfItemChanged(int index,
+                                                const LauncherItem& old_item) {
 }
 
-void LauncherItemDelegateManager::ShelfStatusChanged() {
+void ShelfItemDelegateManager::ShelfStatusChanged() {
 }
 
-void LauncherItemDelegateManager::RemoveLauncherItemDelegate(
-    ash::LauncherID id) {
+void ShelfItemDelegateManager::RemoveShelfItemDelegate(LauncherID id) {
   if (id_to_item_delegate_map_.find(id) != id_to_item_delegate_map_.end()) {
     delete id_to_item_delegate_map_[id];
     id_to_item_delegate_map_.erase(id);