Refactor LauncherDelegate

ash/test/test_launcher_delegate.cc

Index: ash/test/test_launcher_delegate.cc
diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc
index 047c2a9f601e15c9ca748c0c02a01a7a74cfbb4c..ef8b7d7598fc361dc48e8148a2a3ba3291b9bb8a 100644
--- a/ash/test/test_launcher_delegate.cc
+++ b/ash/test/test_launcher_delegate.cc
@@ -4,8 +4,10 @@
 
 #include "ash/test/test_launcher_delegate.h"
 
+#include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_util.h"
+#include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -21,9 +23,31 @@ TestLauncherDelegate::TestLauncherDelegate(LauncherModel* model)
     : model_(model) {
   CHECK(!instance_);
   instance_ = this;
+
+  if (Shell::HasInstance()) {
+    ash::LauncherItemDelegateManager* manager =
+        ash::Shell::GetInstance()->launcher_item_delegate_manager();
+    manager->RegisterLauncherItemDelegate(ash::TYPE_APP_PANEL, this);
+    manager->RegisterLauncherItemDelegate(ash::TYPE_TABBED, 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);
+  }
 }
 
 TestLauncherDelegate::~TestLauncherDelegate() {
+  if (Shell::HasInstance()) {
+    ash::LauncherItemDelegateManager* manager =
+        ash::Shell::GetInstance()->launcher_item_delegate_manager();
+    manager->UnregisterLauncherItemDelegate(ash::TYPE_APP_PANEL);
+    manager->UnregisterLauncherItemDelegate(ash::TYPE_TABBED);
+    manager->UnregisterLauncherItemDelegate(ash::TYPE_APP_SHORTCUT);
+    manager->UnregisterLauncherItemDelegate(ash::TYPE_BROWSER_SHORTCUT);
+    manager->UnregisterLauncherItemDelegate(ash::TYPE_PLATFORM_APP);
+    manager->UnregisterLauncherItemDelegate(ash::TYPE_WINDOWED_APP);
+  }
+
   instance_ = NULL;
 }