Refactor LauncherDelegate

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 1bade434dd44a35b45a7547c5bd7dd0329067b33..2048e65c75965f34cddd65dbb8402ba8cc5c1fd4 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -22,7 +22,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"
@@ -852,9 +852,9 @@ SystemTray* Shell::GetPrimarySystemTray() {
 
 LauncherDelegate* Shell::GetLauncherDelegate() {

[Mr4D (OOO till 08-26), 2013/08/13 18:18:24]

Somehow I need to think about this for a while. Did sky ask for this? It feels
rather odd to have "proxy functions" for an interface which should never be
called - or did I miss something here?

[simonhong_, 2013/08/13 19:54:56]

sky didn't tell specific implementation details for this.
As you may know, this function is called by ShelfWidget.

   if (!launcher_delegate_) {
+    DCHECK(!launcher_model_);

[Mr4D (OOO till 08-26), 2013/08/13 18:18:24]

I assume you mean "!launcher_model_.get()" ?

[simonhong_, 2013/08/13 19:54:56]

Done.
But, I think DCHECK(!launcher_delegate_) also same meaning because it returns 1
if its managed object is not NULL otherwise returns 0.

     launcher_model_.reset(new LauncherModel);
-    launcher_delegate_.reset(
-        delegate_->CreateLauncherDelegate(launcher_model_.get()));
+    launcher_delegate_.reset(new internal::LauncherDelegateProxy);
   }
   return launcher_delegate_.get();
 }