Refactor LauncherItemController and LauncherItemDelegate

ash/launcher/app_list_launcher_item_delegate.cc

Index: ash/launcher/app_list_launcher_item_delegate.cc
diff --git a/ash/launcher/app_list_launcher_item_delegate.cc b/ash/launcher/app_list_launcher_item_delegate.cc
index ffa6ba942abfa3f0f3185c73e7386fb03fa1f933..86115d21706920bd4d8dcde45d75fe3f35091892 100644
--- a/ash/launcher/app_list_launcher_item_delegate.cc
+++ b/ash/launcher/app_list_launcher_item_delegate.cc
@@ -4,10 +4,8 @@
 
 #include "ash/launcher/app_list_launcher_item_delegate.h"
 
-#include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
-#include "ash/shell_delegate.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -17,22 +15,18 @@ namespace internal {
 AppListLauncherItemDelegate::AppListLauncherItemDelegate() {
   // TODO(simon.hong81): This works for the moment, but the AppList LauncherItem
   // creation should move here.
-  ash::Shell::GetInstance()->launcher_item_delegate_manager()->
-      RegisterLauncherItemDelegate(ash::TYPE_APP_LIST, this);
 }
 
 AppListLauncherItemDelegate::~AppListLauncherItemDelegate() {
-  // Don't unregister this from LauncherItemDelegateManager.
-  // LauncherItemDelegateManager is already destroyed.
+  // LauncerItemDelegateManager owns and destroys this class.
 }
 
-void AppListLauncherItemDelegate::ItemSelected(const LauncherItem& item,
-                                               const ui::Event& event) {
+void AppListLauncherItemDelegate::ItemSelected(const ui::Event& event) {
   // Pass NULL here to show the app list in the currently active RootWindow.
   Shell::GetInstance()->ToggleAppList(NULL);
 }
 
-base::string16 AppListLauncherItemDelegate::GetTitle(const LauncherItem& item) {
+base::string16 AppListLauncherItemDelegate::GetTitle() {
   LauncherModel* model = Shell::GetInstance()->launcher_model();
   DCHECK(model);
   return model->status() == LauncherModel::STATUS_LOADING ?
@@ -41,23 +35,21 @@ base::string16 AppListLauncherItemDelegate::GetTitle(const LauncherItem& item) {
 }
 
 ui::MenuModel* AppListLauncherItemDelegate::CreateContextMenu(
-    const LauncherItem& item,
     aura::RootWindow* root_window) {
   return NULL;
 }
 
 LauncherMenuModel* AppListLauncherItemDelegate::CreateApplicationMenu(
-    const LauncherItem& item,
     int event_flags) {
   // AppList does not show an application menu.
   return NULL;
 }
 
-bool AppListLauncherItemDelegate::IsDraggable(const LauncherItem& item) {
+bool AppListLauncherItemDelegate::IsDraggable() {
   return false;
 }
 
-bool AppListLauncherItemDelegate::ShouldShowTooltip(const LauncherItem& item) {
+bool AppListLauncherItemDelegate::ShouldShowTooltip() {
   return true;
 }