Refactor LauncherDelegate

ash/shell.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
 #include "ash/ash_switches.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_view.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/event_transformation_handler.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/display/screen_position_controller.h"
 #include "ash/drag_drop/drag_drop_controller.h"
 #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"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
@@ skipping 807 matching lines @@
 
 bool Shell::HasPrimaryStatusArea() {
   ShelfWidget* shelf = GetPrimaryRootWindowController()->shelf();
   return shelf && shelf->status_area_widget();
 }
 
 SystemTray* Shell::GetPrimarySystemTray() {
   return GetPrimaryRootWindowController()->GetSystemTray();
 }
 
 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();
 }
 
 void Shell::SetTouchHudProjectionEnabled(bool enabled) {
   if (is_touch_hud_projection_enabled_ == enabled)
     return;
 
   is_touch_hud_projection_enabled_ = enabled;
   FOR_EACH_OBSERVER(ShellObserver, observers_,
@@ skipping 98 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash