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

Unified Diff: ash/common/session/session_state_observer.cc

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 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/session/session_state_delegate.cc ('k') | ash/common/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/session/session_state_observer.cc
diff --git a/ash/common/session/session_state_observer.cc b/ash/common/session/session_state_observer.cc
index 27bbe9d8d3c79448989f1fa8c92d9de93112de35..709a92da27cb27153e1db0717bb1e0e7395d54b7 100644
--- a/ash/common/session/session_state_observer.cc
+++ b/ash/common/session/session_state_observer.cc
@@ -4,7 +4,7 @@
#include "ash/common/session/session_state_observer.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/wm_shell.h"
namespace ash {
@@ -12,13 +12,12 @@ namespace ash {
ScopedSessionStateObserver::ScopedSessionStateObserver(
SessionStateObserver* observer)
: observer_(observer) {
- WmShell::Get()->GetSessionStateDelegate()->AddSessionStateObserver(observer_);
+ WmShell::Get()->session_controller()->AddSessionStateObserver(observer_);
}
ScopedSessionStateObserver::~ScopedSessionStateObserver() {
if (WmShell::Get()) {
- WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(
- observer_);
+ WmShell::Get()->session_controller()->RemoveSessionStateObserver(observer_);
}
}
« no previous file with comments | « ash/common/session/session_state_delegate.cc ('k') | ash/common/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698