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

Unified Diff: ash/common/wm/maximize_mode/maximize_mode_event_handler.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/wm/container_finder.cc ('k') | ash/common/wm/overview/window_selector_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
diff --git a/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc b/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
index da7750604e366de378f9b0f94c10931b8bc9abde..49905c80f148de927c38046582d4c4ac32f88453 100644
--- a/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
+++ b/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
@@ -4,7 +4,7 @@
#include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_event.h"
@@ -30,11 +30,10 @@ bool MaximizeModeEventHandler::ToggleFullscreen(const ui::TouchEvent& event) {
if (event.type() != ui::ET_TOUCH_PRESSED)
return false;
- const SessionStateDelegate* delegate =
- WmShell::Get()->GetSessionStateDelegate();
+ const SessionController* controller = WmShell::Get()->session_controller();
- if (delegate->IsScreenLocked() ||
- delegate->GetSessionState() != session_manager::SessionState::ACTIVE) {
+ if (controller->IsScreenLocked() ||
+ controller->GetSessionState() != session_manager::SessionState::ACTIVE) {
return false;
}
« no previous file with comments | « ash/common/wm/container_finder.cc ('k') | ash/common/wm/overview/window_selector_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698