Refactor LauncherItemController and LauncherItemDelegate

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"
@@ skipping 10 matching lines @@
 #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/app_list_launcher_item_delegate.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_item_delegate.h"
 #include "ash/launcher/launcher_item_delegate_manager.h"
 #include "ash/launcher/launcher_model.h"
+#include "ash/launcher/launcher_util.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"
 #include "ash/shell_window_ids.h"
@@ skipping 258 matching lines @@
   partial_magnification_controller_.reset();
   resize_shadow_controller_.reset();
   shadow_controller_.reset();
   tooltip_controller_.reset();
   event_client_.reset();
   window_cycle_controller_.reset();
   nested_dispatcher_controller_.reset();
   user_action_client_.reset();
   visibility_controller_.reset();
   launcher_delegate_.reset();
+  launcher_item_delegate_manager_.reset();
   launcher_model_.reset();
   video_detector_.reset();
 
   power_button_controller_.reset();
   lock_state_controller_.reset();
   mru_window_tracker_.reset();
 
   resolution_notification_controller_.reset();
 
   // This also deletes all RootWindows. Note that we invoke Shutdown() on
@@ skipping 527 matching lines @@
   ShelfWidget* shelf = GetPrimaryRootWindowController()->shelf();
   return shelf && shelf->status_area_widget();
 }
 
 SystemTray* Shell::GetPrimarySystemTray() {
   return GetPrimaryRootWindowController()->GetSystemTray();
 }
 
 LauncherDelegate* Shell::GetLauncherDelegate() {
   if (!launcher_delegate_) {
-    // Creates LauncherItemDelegateManager before LauncherDelegate.
+    launcher_model_.reset(new LauncherModel);
+    // Create LauncherItemDelegateManager before LauncherDelegate.
     launcher_item_delegate_manager_.reset(new LauncherItemDelegateManager);
-    launcher_model_.reset(new LauncherModel);
     launcher_delegate_.reset(
         delegate_->CreateLauncherDelegate(launcher_model_.get()));
-    app_list_launcher_item_delegate_.reset(
+    // Create AppListLauncherItemDelegate and register.

[sky, 2013/09/11 01:42:57]

This comment describes exactly waht the code does and isn't helpful. Nuke it.

[simonhong_, 2013/09/11 09:05:26]

Done.

+    launcher_item_delegate_manager_->RegisterLauncherItemDelegate(
+        ash::launcher::GetAppListItemID(*launcher_model_),
         new internal::AppListLauncherItemDelegate);
   }
   return launcher_delegate_.get();
 }
 
 void Shell::SetTouchHudProjectionEnabled(bool enabled) {
   if (is_touch_hud_projection_enabled_ == enabled)
     return;
 
   is_touch_hud_projection_enabled_ = enabled;
@@ skipping 95 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