mash: Fold ShelfItemDelegateManager into ShelfModel

ash/common/wm_shell.cc

 // Copyright 2016 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/common/wm_shell.h"
 
 #include <utility>
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/focus_cycler.h"
 #include "ash/common/keyboard/keyboard_ui.h"
+#include "ash/common/shelf/app_list_shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/brightness_control_delegate.h"
 #include "ash/common/system/keyboard_brightness_control_delegate.h"
 #include "ash/common/system/toast/toast_manager.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/mru_window_tracker.h"
@@ skipping 25 matching lines @@
 WmShell* WmShell::Get() {
   return instance_;
 }
 
 void WmShell::Initialize() {
   // Some delegates access WmShell during their construction. Create them here
   // instead of the WmShell constructor.
   accessibility_delegate_.reset(delegate_->CreateAccessibilityDelegate());
   media_delegate_.reset(delegate_->CreateMediaDelegate());
   toast_manager_.reset(new ToastManager);
+
+  // Create the app list item in the shelf data model.
+  AppListShelfItemDelegate::CreateAppListItemAndDelegate(shelf_model_.get());
 }
 
 void WmShell::Shutdown() {
   // Accesses WmShell in its destructor.
   accessibility_delegate_.reset();
+  // ShelfItemDelegate subclasses it owns have complex cleanup to run, so

[msw, 2016/07/21 21:30:53]

Is this still needed? Don't stress too much looking/removing it now.

[James Cook, 2016/07/22 01:20:08]

My worries about ARC items are the same as in the initial patch -- they do
complex cleanup on close.

[msw, 2016/07/22 01:49:51]

Do you mean ArcAppDeferredLauncherItemController and/or
ArcPlaystoreShortcutLauncherItemController? those destructors look pretty
innocuous. What am I missing here?

+  // explicitly shutdown early.
+  shelf_model_->Shutdown();
 }
 
 void WmShell::OnMaximizeModeStarted() {
   FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeStarted());
 }
 
 void WmShell::OnMaximizeModeEnded() {
   FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeEnded());
 }
 
@@ skipping 24 matching lines @@
   lock_state_observers_.AddObserver(observer);
 }
 
 void WmShell::RemoveLockStateObserver(LockStateObserver* observer) {
   lock_state_observers_.RemoveObserver(observer);
 }
 
 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
     : delegate_(std::move(shell_delegate)),
       focus_cycler_(new FocusCycler),
-      shelf_model_(new ShelfModel),
+      shelf_model_(new ShelfModel),  // Must create before ShelfDelegate.
       system_tray_notifier_(new SystemTrayNotifier),
+      window_cycle_controller_(new WindowCycleController),
       window_selector_controller_(new WindowSelectorController) {
 #if defined(OS_CHROMEOS)
   brightness_control_delegate_.reset(new system::BrightnessControllerChromeos);
   keyboard_brightness_control_delegate_.reset(new KeyboardBrightnessController);
 #endif
-  window_cycle_controller_.reset(new WindowCycleController());
 }
 
 WmShell::~WmShell() {}
 
 bool WmShell::IsSystemModalWindowOpen() {
   if (simulate_modal_window_open_for_testing_)
     return true;
 
   // Traverse all system modal containers, and find its direct child window
   // with "SystemModal" setting, and visible.
@@ skipping 85 matching lines @@
 
 void WmShell::DeleteMruWindowTracker() {
   mru_window_tracker_.reset();
 }
 
 void WmShell::DeleteToastManager() {
   toast_manager_.reset();
 }
 
 }  // namespace ash