Refactor LauncherDelegate

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 378b0e809b8852c057631ed34027fa8d412c4cda..b07a03251594ee0beea38274540f7526d5a2d7df 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -23,7 +23,7 @@
 #include "ash/focus_cycler.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/host/root_window_host_factory.h"
-#include "ash/launcher/launcher_delegate.h"
+#include "ash/launcher/launcher_delegate_proxy.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
@@ -865,9 +865,9 @@ SystemTray* Shell::GetPrimarySystemTray() {
 
 LauncherDelegate* Shell::GetLauncherDelegate() {
   if (!launcher_delegate_) {
+    DCHECK(!launcher_model_.get());
     launcher_model_.reset(new LauncherModel);
-    launcher_delegate_.reset(
-        delegate_->CreateLauncherDelegate(launcher_model_.get()));
+    launcher_delegate_.reset(new internal::LauncherDelegateProxy);
   }
   return launcher_delegate_.get();
 }