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

Unified Diff: trunk/src/ash/wm/stacking_controller.cc

Issue 14200034: Revert 194578 "Add ash SessionStateDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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
Index: trunk/src/ash/wm/stacking_controller.cc
===================================================================
--- trunk/src/ash/wm/stacking_controller.cc (revision 194588)
+++ trunk/src/ash/wm/stacking_controller.cc (working copy)
@@ -5,8 +5,8 @@
#include "ash/wm/stacking_controller.h"
#include "ash/display/display_controller.h"
-#include "ash/session_state_delegate.h"
#include "ash/shell.h"
+#include "ash/shell_delegate.h"
#include "ash/shell_window_ids.h"
#include "ash/wm/always_on_top_controller.h"
#include "ash/wm/coordinate_conversion.h"
@@ -119,9 +119,8 @@
// If screen lock is not active and user session is active,
// all modal windows are placed into the normal modal container.
- if (!Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
- Shell::GetInstance()->session_state_delegate()->
- IsActiveUserSessionStarted()) {
+ if (!Shell::GetInstance()->delegate()->IsScreenLocked() &&
+ Shell::GetInstance()->delegate()->IsSessionStarted()) {
return GetContainerById(root,
internal::kShellWindowId_SystemModalContainer);
}
« no previous file with comments | « trunk/src/ash/wm/session_state_controller_impl2_unittest.cc ('k') | trunk/src/ash/wm/system_modal_container_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698