Promotes more accessors from WmShell to Shell

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/session/session_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/app_list_shelf_item_delegate.h"
 #include "ash/common/shell_delegate.h"
-#include "ash/common/shutdown_controller.h"
-#include "ash/common/system/chromeos/network/vpn_list.h"
-#include "ash/common/system/tray/system_tray_notifier.h"
-#include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/system_modal_container_layout_manager.h"
-#include "ash/common/wm/window_cycle_controller.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/display/display.h"
 
 namespace ash {
@@ skipping 33 matching lines @@
 }
 
 void WmShell::AddLockStateObserver(LockStateObserver* observer) {
   lock_state_observers_.AddObserver(observer);
 }
 
 void WmShell::RemoveLockStateObserver(LockStateObserver* observer) {
   lock_state_observers_.RemoveObserver(observer);
 }
 
-WmShell::WmShell()
-    : shutdown_controller_(base::MakeUnique<ShutdownController>()),
-      system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
-      vpn_list_(base::MakeUnique<VpnList>()),
-      window_cycle_controller_(base::MakeUnique<WindowCycleController>()),
-      window_selector_controller_(
-          base::MakeUnique<WindowSelectorController>()) {
+WmShell::WmShell() {
   DCHECK(!instance_);
   instance_ = this;
 }
 
 RootWindowController* WmShell::GetPrimaryRootWindowController() {
   return GetPrimaryRootWindow()->GetRootWindowController();
 }
 
 bool WmShell::IsForceMaximizeOnFirstRun() {
   return Shell::Get()->shell_delegate()->IsForceMaximizeOnFirstRun();
@@ skipping 36 matching lines @@
       return;
     }
   }
   for (WmWindow* root_window : root_windows) {
     root_window->GetRootWindowController()
         ->GetSystemModalLayoutManager(removed)
         ->DestroyModalBackground();
   }
 }
 
-void WmShell::DeleteWindowCycleController() {
-  window_cycle_controller_.reset();
-}
-
-void WmShell::DeleteWindowSelectorController() {
-  window_selector_controller_.reset();
-}
-
 }  // namespace ash