Refactor LauncherItemController and LauncherItemDelegate

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 12a547fe07126fe6a9624c2e3edb813d5dd8fa6f..b1511395a9e852de13ff7ee51073974875632317 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -28,6 +28,7 @@
 #include "ash/launcher/launcher_item_delegate.h"
 #include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/launcher/launcher_model.h"
+#include "ash/launcher/launcher_util.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/root_window_controller.h"
@@ -306,6 +307,7 @@ Shell::~Shell() {
   user_action_client_.reset();
   visibility_controller_.reset();
   launcher_delegate_.reset();
+  launcher_item_delegate_manager_.reset();
   launcher_model_.reset();
   video_detector_.reset();
 
@@ -853,12 +855,14 @@ SystemTray* Shell::GetPrimarySystemTray() {
 
 LauncherDelegate* Shell::GetLauncherDelegate() {
   if (!launcher_delegate_) {
-    // Creates LauncherItemDelegateManager before LauncherDelegate.
-    launcher_item_delegate_manager_.reset(new LauncherItemDelegateManager);
     launcher_model_.reset(new LauncherModel);
+    // Create LauncherItemDelegateManager before LauncherDelegate.
+    launcher_item_delegate_manager_.reset(new LauncherItemDelegateManager);
     launcher_delegate_.reset(
         delegate_->CreateLauncherDelegate(launcher_model_.get()));
-    app_list_launcher_item_delegate_.reset(
+    // Create AppListLauncherItemDelegate and register.

[sky, 2013/09/11 01:42:57]

This comment describes exactly waht the code does and isn't helpful. Nuke it.

[simonhong_, 2013/09/11 09:05:26]

Done.

+    launcher_item_delegate_manager_->RegisterLauncherItemDelegate(
+        ash::launcher::GetAppListItemID(*launcher_model_),
         new internal::AppListLauncherItemDelegate);
   }
   return launcher_delegate_.get();