mash: Move ownership of ShelfDelegate to WmShell

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/accelerators/accelerator_controller.h"
 #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_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 36 matching lines @@
   // 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 (e.g. ARC
   // shelf items in Chrome) so explicitly shutdown early.
   shelf_model_->DestroyItemDelegates();
+  // Must be destroyed before FocusClient.
+  shelf_delegate_.reset();
 }
 
 void WmShell::OnMaximizeModeStarted() {
   FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeStarted());
 }
 
 void WmShell::OnMaximizeModeEnded() {
   FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeEnded());
 }
 
@@ skipping 21 matching lines @@
 }
 
 void WmShell::AddLockStateObserver(LockStateObserver* observer) {
   lock_state_observers_.AddObserver(observer);
 }
 
 void WmShell::RemoveLockStateObserver(LockStateObserver* observer) {
   lock_state_observers_.RemoveObserver(observer);
 }
 
+void WmShell::SetShelfDelegateForTesting(
+    std::unique_ptr<ShelfDelegate> test_delegate) {
+  shelf_delegate_ = std::move(test_delegate);
+}
+
 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
     : delegate_(std::move(shell_delegate)),
       focus_cycler_(new FocusCycler),
       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);
@@ skipping 67 matching lines @@
 }
 
 void WmShell::DeleteSystemTrayDelegate() {
   DCHECK(system_tray_delegate_);
 #if defined(OS_CHROMEOS)
   logout_confirmation_controller_.reset();
 #endif
   system_tray_delegate_.reset();
 }
 
+void WmShell::CreateShelfDelegate() {

[msw, 2016/07/23 00:02:36]

Could we just do this once in the ctor?

[James Cook, 2016/07/23 00:38:03]

No. It must be done after login. Moved the DCHECKS from ash::Shell to here to
make that more clear.

+  // May be called multiple times as shelves are created and destroyed.
+  if (shelf_delegate_)
+    return;
+  shelf_delegate_.reset(delegate_->CreateShelfDelegate(shelf_model_.get()));
+}
+
 void WmShell::DeleteWindowCycleController() {
   window_cycle_controller_.reset();
 }
 
 void WmShell::DeleteWindowSelectorController() {
   window_selector_controller_.reset();
 }
 
 void WmShell::CreateMaximizeModeController() {
   maximize_mode_controller_.reset(new MaximizeModeController);
@@ skipping 14 matching lines @@
 void WmShell::DeleteToastManager() {
   toast_manager_.reset();
 }
 
 void WmShell::SetAcceleratorController(
     std::unique_ptr<AcceleratorController> accelerator_controller) {
   accelerator_controller_ = std::move(accelerator_controller);
 }
 
 }  // namespace ash