Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Unified Diff: ash/common/wm_shell.cc

Issue 2084503007: Moves WindowSelectorController onto WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_overview
Patch Set: fix mash Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/desktop_background/desktop_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index f0d1b68753d7d4523424468dbfa927277f6bdd99..974c1dbe45d6a407d975be53eaabed574dccbf14 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -8,6 +8,7 @@
#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"
@@ -28,7 +29,8 @@ WmShell* WmShell::Get() {
WmShell::WmShell()
: focus_cycler_(new FocusCycler),
- system_tray_notifier_(new WmSystemTrayNotifier) {}
+ system_tray_notifier_(new WmSystemTrayNotifier),
+ window_selector_controller_(new WindowSelectorController()) {}
WmShell::~WmShell() {}
@@ -66,4 +68,8 @@ void WmShell::SetSystemTrayDelegate(
}
}
+void WmShell::DeleteWindowSelectorController() {
+ window_selector_controller_.reset();
+}
+
} // namespace ash
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/desktop_background/desktop_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698