mash: Migrate ShellDelegate ownership and access 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 "ash/common/focus_cycler.h"
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
@@ skipping 35 matching lines @@
 }
 
 void WmShell::AddShellObserver(ShellObserver* observer) {
   shell_observers_.AddObserver(observer);
 }
 
 void WmShell::RemoveShellObserver(ShellObserver* observer) {
   shell_observers_.RemoveObserver(observer);
 }
 
-WmShell::WmShell()
-    : focus_cycler_(new FocusCycler),
+WmShell::WmShell(ShellDelegate* delegate)
+    : delegate_(delegate),
+      focus_cycler_(new FocusCycler),
       system_tray_notifier_(new SystemTrayNotifier),
       window_selector_controller_(new WindowSelectorController()) {}
 
 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.
   for (WmWindow* root : GetAllRootWindows()) {
     WmWindow* system_modal =
         root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
     if (!system_modal)
       continue;
     for (const WmWindow* child : system_modal->GetChildren()) {
       if (child->IsSystemModal() && child->GetTargetVisibility()) {
         return true;
       }
     }
   }
   return false;
 }
 
 void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) {
   keyboard_ui_ = std::move(keyboard_ui);
 }
 
+void WmShell::DeleteShellDelegate() {
+  delegate_.reset();
+}
+
 void WmShell::SetMediaDelegate(std::unique_ptr<MediaDelegate> delegate) {
   media_delegate_ = std::move(delegate);
 }
 
 void WmShell::SetSystemTrayDelegate(
     std::unique_ptr<SystemTrayDelegate> delegate) {
   DCHECK(delegate);
   DCHECK(!system_tray_delegate_);
   // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common.
   system_tray_delegate_ = std::move(delegate);
@@ skipping 27 matching lines @@
 
 void WmShell::CreateMruWindowTracker() {
   mru_window_tracker_.reset(new MruWindowTracker);
 }
 
 void WmShell::DeleteMruWindowTracker() {
   mru_window_tracker_.reset();
 }
 
 }  // namespace ash