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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/chrome/browser/idle_chromeos.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/chrome/browser/chromeos/dbus/printer_service_provider.cc ('k') | trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/idle_chromeos.cc
===================================================================
--- trunk/src/chrome/browser/idle_chromeos.cc (revision 194599)
+++ trunk/src/chrome/browser/idle_chromeos.cc (working copy)
@@ -4,6 +4,7 @@
#include "chrome/browser/idle.h"
+#include "ash/session_state_delegate.h"
#include "ash/shell.h"
#include "ash/wm/user_activity_detector.h"
#include "base/time.h"
@@ -15,5 +16,5 @@
}
bool CheckIdleStateIsLocked() {
- return ash::Shell::GetInstance()->IsScreenLocked();
+ return ash::Shell::GetInstance()->session_state_delegate()->IsScreenLocked();
}
Property changes on: trunk/src/chrome/browser/idle_chromeos.cc
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « trunk/src/chrome/browser/chromeos/dbus/printer_service_provider.cc ('k') | trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698