Moves WindowSelectorController onto 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/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/wm_system_tray_notifier.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_window.h"
 #include "base/logging.h"
 
 namespace ash {
 
 // static
 WmShell* WmShell::instance_ = nullptr;
 
 // static
 void WmShell::Set(WmShell* instance) {
@@ skipping 38 matching lines @@
     // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common.
     system_tray_delegate_ = std::move(delegate);
     system_tray_delegate_->Initialize();
   } else {
     DCHECK(system_tray_delegate_);
     system_tray_delegate_->Shutdown();
     system_tray_delegate_.reset();
   }
 }
 
+void WmShell::CreateWindowSelectorController() {
+  window_selector_controller_.reset(new WindowSelectorController());

[James Cook, 2016/06/22 22:46:19]

WindowSelectorController does nothing in its constructor and destructor. Do you
think it could be initialized in the WmShell constructor, similar to
FocusCycler?

This would eliminate the need for null checks with window_selector_controller().

[sky, 2016/06/22 23:19:39]

I made construction immediate, but destruction has to be explicit. While it
looks like ~WSC does nothing, it deletes the WindowSelector, which deletes a
bunch of other stuff. The deletion has to happen where it is or we have shutdown
problems.
I suspect these were never really needed.

+}
+
+void WmShell::DeleteWindowSelectorController() {
+  window_selector_controller_.reset();
+}
+
 }  // namespace ash