Refactor LauncherDelegate

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index d734685ce48f4cafa77ff36111c4f652b157e05a..c9b80fdefe3ecfe2db6f7a762da41ed2b820efab 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -8,6 +8,7 @@
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
+#include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_util.h"
 #include "ash/root_window_controller.h"
@@ -243,6 +244,9 @@ ChromeLauncherController::ChromeLauncherController(
       prefs::kShelfPreferences,
       base::Bind(&ChromeLauncherController::SetShelfBehaviorsFromPrefs,
                  base::Unretained(this)));
+
+  if (ash::Shell::HasInstance())

[Mr4D (OOO till 08-26), 2013/08/27 15:00:52]

This is odd. Since the ChromeLauncherController gets created by the shell this
test shouldn't be necessary. I suppose it is done for unit tests? Did you try
without?

[simonhong_, 2013/08/27 15:08:55]

Without this, all ChromeLauncherControllerTest is failed by win7_aura trybot.
(Of course, all above tests are passed by linux_chromeos)
I think it is strange why ChromeLauncherControllerTest is tested by win7_aura.

+    RegisterLauncherItemDelegate();
 }
 
 ChromeLauncherController::~ChromeLauncherController() {
@@ -1651,3 +1655,16 @@ ChromeLauncherController::MoveItemWithoutPinnedStateChangeNotification(
   base::AutoReset<bool> auto_reset(&ignore_persist_pinned_state_change_, true);
   model_->Move(source_index, target_index);
 }
+
+void ChromeLauncherController::RegisterLauncherItemDelegate() {
+  // TODO(simon.hong81): Register LauncherItemDelegate when LauncherItemDelegate
+  // is created.
+  ash::LauncherItemDelegateManager* manager =
+      ash::Shell::GetInstance()->launcher_item_delegate_manager();
+  manager->RegisterLauncherItemDelegate(ash::TYPE_TABBED, this);
+  manager->RegisterLauncherItemDelegate(ash::TYPE_APP_PANEL, this);
+  manager->RegisterLauncherItemDelegate(ash::TYPE_APP_SHORTCUT, this);
+  manager->RegisterLauncherItemDelegate(ash::TYPE_BROWSER_SHORTCUT, this);
+  manager->RegisterLauncherItemDelegate(ash::TYPE_PLATFORM_APP, this);
+  manager->RegisterLauncherItemDelegate(ash::TYPE_WINDOWED_APP, this);
+}