Revert 226547 "Refactor LauncherItemController and LauncherItemD..."

trunk/src/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/accelerator_controller.h"
@@ skipping 20 matching lines @@
 #include "ash/launcher/launcher_item_delegate.h"
 #include "ash/launcher/launcher_item_delegate_manager.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/app_list_shelf_item_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/locale/locale_notification_controller.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/wm/app_list_controller.h"
 #include "ash/wm/ash_focus_rules.h"
@@ skipping 203 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_| observes |launcher_model_|. It must be
-  // destroyed before |launcher_model_| is destroyed.
-  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();
   desktop_background_controller_.reset();
 
@@ skipping 536 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_item_delegate_manager_.reset(new LauncherItemDelegateManager);
     launcher_model_.reset(new LauncherModel);
-    // Creates LauncherItemDelegateManager before LauncherDelegate.
-    launcher_item_delegate_manager_.reset(
-        new LauncherItemDelegateManager(launcher_model_.get()));
-
     launcher_delegate_.reset(
         delegate_->CreateLauncherDelegate(launcher_model_.get()));
-    scoped_ptr<LauncherItemDelegate> controller(
+    app_list_shelf_item_delegate_.reset(
         new internal::AppListShelfItemDelegate);
-
-    ash::LauncherID app_list_id = 0;
-    // TODO(simon.hong81): Make function for this in shelf_util.h
-    for (size_t i = 0; i < launcher_model_->items().size(); ++i) {
-      if (launcher_model_->items()[i].type == ash::TYPE_APP_LIST) {
-        app_list_id = launcher_model_->items()[i].id;
-        break;
-      }
-    }
-    DCHECK(app_list_id);
-    launcher_item_delegate_manager_->SetLauncherItemDelegate(
-        app_list_id,
-        controller.Pass());
   }
   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 92 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