Refactor LauncherItemController and LauncherItemDelegate

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index d7a6632de0b83961b4f5fbfc6adf2395dc04e66c..8027f4ad60cbc341448af7cede60f48f86960639 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -80,6 +80,7 @@ class DisplayController;
 class HighContrastController;
 class Launcher;
 class LauncherDelegate;
+class LauncherItemDelegate;
 class LauncherItemDelegateManager;
 class LauncherModel;
 class MagnificationController;
@@ -107,7 +108,6 @@ class WindowSelectorController;
 namespace internal {
 class AcceleratorFilter;
 class AppListController;
-class AppListShelfItemDelegate;
 class CaptureController;
 class DisplayChangeObserver;
 class DisplayErrorObserver;
@@ -563,8 +563,6 @@ class ASH_EXPORT Shell
   scoped_ptr<SessionStateDelegate> session_state_delegate_;
   scoped_ptr<LauncherDelegate> launcher_delegate_;
   scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;
-  scoped_ptr<internal::AppListShelfItemDelegate>
-      app_list_shelf_item_delegate_;
 
   scoped_ptr<LauncherModel> launcher_model_;
   scoped_ptr<ash::WindowPositioner> window_positioner_;