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

Unified Diff: ash/wm/system_modal_container_layout_manager.cc

Issue 14295008: Add ash SessionStateDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. 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
« no previous file with comments | « ash/wm/stacking_controller.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_modal_container_layout_manager.cc
diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc
index 192d5ab726db1cea8d629612fa14bbd750cf9182..d35aaa6a2715c0bc33697d47db3a5f12c9e14912 100644
--- a/ash/wm/system_modal_container_layout_manager.cc
+++ b/ash/wm/system_modal_container_layout_manager.cc
@@ -4,8 +4,8 @@
#include "ash/wm/system_modal_container_layout_manager.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/system_modal_container_event_filter.h"
#include "ash/wm/window_animations.h"
@@ -67,8 +67,9 @@ void SystemModalContainerLayoutManager::OnWindowAddedToLayout(
child->type() == aura::client::WINDOW_TYPE_POPUP);
DCHECK(
container_->id() != internal::kShellWindowId_LockSystemModalContainer ||
- Shell::GetInstance()->delegate()->IsScreenLocked() ||
- !Shell::GetInstance()->delegate()->IsSessionStarted());
+ Shell::GetInstance()->session_state_delegate()->IsScreenLocked() ||
+ !Shell::GetInstance()->session_state_delegate()->
+ IsActiveUserSessionStarted());
child->AddObserver(this);
if (child->GetProperty(aura::client::kModalKey) != ui::MODAL_TYPE_NONE)
@@ -138,7 +139,7 @@ bool SystemModalContainerLayoutManager::CanWindowReceiveEvents(
return true;
// This container can not handle events if the screen is locked and it is not
// above the lock screen layer (crbug.com/110920).
- if (ash::Shell::GetInstance()->IsScreenLocked() &&
+ if (Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
container_->id() < ash::internal::kShellWindowId_LockScreenContainer)
return true;
return wm::GetActivatableWindow(window) == modal_window();
« no previous file with comments | « ash/wm/stacking_controller.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698