ash: Rename more Launcher classes to Shelf*.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index d5428cff559a947027e9221d0ad58ae1e1b0198b..81979ae3e092c28c14fef8c6004b478ea2438570 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -31,8 +31,6 @@
 #include "ash/host/root_window_host_factory.h"
 #include "ash/keyboard_uma_event_filter.h"
 #include "ash/launcher/launcher_delegate.h"
-#include "ash/launcher/launcher_item_delegate.h"
-#include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/media_delegate.h"
@@ -41,6 +39,8 @@
 #include "ash/screen_ash.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/app_list_shelf_item_delegate.h"
+#include "ash/shelf/shelf_item_delegate.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"
@@ -499,24 +499,23 @@ SystemTray* Shell::GetPrimarySystemTray() {
 LauncherDelegate* Shell::GetLauncherDelegate() {
   if (!launcher_delegate_) {
     shelf_model_.reset(new ShelfModel);
-    // Creates LauncherItemDelegateManager before LauncherDelegate.
-    launcher_item_delegate_manager_.reset(
-        new LauncherItemDelegateManager(shelf_model_.get()));
+    // Creates ShelfItemDelegateManager before LauncherDelegate.
+    shelf_item_delegate_manager_.reset(
+        new ShelfItemDelegateManager(shelf_model_.get()));
 
     launcher_delegate_.reset(
         delegate_->CreateLauncherDelegate(shelf_model_.get()));
-    scoped_ptr<LauncherItemDelegate> controller(
+    scoped_ptr<ShelfItemDelegate> controller(
         new internal::AppListShelfItemDelegate);
 
     // Finding the shelf model's location of the app list and setting its
-    // LauncherItemDelegate.
+    // ShelfItemDelegate.
     int app_list_index = shelf_model_->GetItemIndexForType(TYPE_APP_LIST);
     DCHECK_GE(app_list_index, 0);
     LauncherID app_list_id = shelf_model_->items()[app_list_index].id;
     DCHECK(app_list_id);
-    launcher_item_delegate_manager_->SetLauncherItemDelegate(
-        app_list_id,
-        controller.Pass());
+    shelf_item_delegate_manager_->SetShelfItemDelegate(app_list_id,
+                                                       controller.Pass());
   }
   return launcher_delegate_.get();
 }
@@ -656,9 +655,9 @@ Shell::~Shell() {
   user_action_client_.reset();
   visibility_controller_.reset();
   launcher_delegate_.reset();
-  // |launcher_item_delegate_manager_| observes |shelf_model_|. It must be
+  // |shelf_item_delegate_manager_| observes |shelf_model_|. It must be
   // destroyed before |shelf_model_| is destroyed.
-  launcher_item_delegate_manager_.reset();
+  shelf_item_delegate_manager_.reset();
   shelf_model_.reset();
   video_detector_.reset();