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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 14200038: Revert 194589 "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
« no previous file with comments | « trunk/src/ash/test/test_shell_delegate.cc ('k') | trunk/src/ash/wm/gestures/shelf_gesture_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/wm/event_client_impl.cc
===================================================================
--- trunk/src/ash/wm/event_client_impl.cc (revision 194599)
+++ trunk/src/ash/wm/event_client_impl.cc (working copy)
@@ -4,6 +4,7 @@
#include "ash/wm/event_client_impl.h"
+#include "ash/session_state_delegate.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
#include "ui/aura/window.h"
@@ -21,7 +22,8 @@
const aura::Window* window) const {
const aura::RootWindow* root_window =
window ? window->GetRootWindow() : NULL;
- if (Shell::GetInstance()->IsScreenLocked() && root_window) {
+ if (Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
+ root_window) {
const aura::Window* lock_screen_containers = Shell::GetContainer(
root_window,
kShellWindowId_LockScreenContainersContainer);
Property changes on: trunk/src/ash/wm/event_client_impl.cc
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « trunk/src/ash/test/test_shell_delegate.cc ('k') | trunk/src/ash/wm/gestures/shelf_gesture_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698