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

Unified Diff: ash/common/wm_shell.cc

Issue 2115663002: Folds methods in WmShellCommon to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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/common/wm_shell_common.h » ('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 fb9a63cca61238cc88103715069bea334b5c44bd..5d607d60ebc7507ac1f777c2ceeb83c592e23d27 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -10,6 +10,7 @@
#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/system/tray/system_tray_notifier.h"
+#include "ash/common/wm/mru_window_tracker.h"
#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_window.h"
#include "base/bind.h"
@@ -30,6 +31,19 @@ WmShell* WmShell::Get() {
return instance_;
}
+void WmShell::NotifyPinnedStateChanged(WmWindow* pinned_window) {
+ FOR_EACH_OBSERVER(ShellObserver, shell_observers_,
+ OnPinnedStateChanged(pinned_window));
+}
+
+void WmShell::AddShellObserver(ShellObserver* observer) {
+ shell_observers_.AddObserver(observer);
+}
+
+void WmShell::RemoveShellObserver(ShellObserver* observer) {
+ shell_observers_.RemoveObserver(observer);
+}
+
WmShell::WmShell()
: focus_cycler_(new FocusCycler),
system_tray_notifier_(new SystemTrayNotifier),
@@ -91,4 +105,12 @@ void WmShell::DeleteWindowSelectorController() {
window_selector_controller_.reset();
}
+void WmShell::CreateMruWindowTracker() {
+ mru_window_tracker_.reset(new MruWindowTracker);
+}
+
+void WmShell::DeleteMruWindowTracker() {
+ mru_window_tracker_.reset();
+}
+
} // namespace ash
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/common/wm_shell_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698