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

Unified Diff: trunk/src/chrome/browser/chromeos/dbus/printer_service_provider.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
« no previous file with comments | « trunk/src/ash/wm/workspace/workspace_layout_manager.cc ('k') | trunk/src/chrome/browser/idle_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/chromeos/dbus/printer_service_provider.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/dbus/printer_service_provider.cc (revision 194588)
+++ trunk/src/chrome/browser/chromeos/dbus/printer_service_provider.cc (working copy)
@@ -4,8 +4,8 @@
#include "chrome/browser/chromeos/dbus/printer_service_provider.h"
-#include "ash/session_state_delegate.h"
#include "ash/shell.h"
+#include "ash/shell_delegate.h"
#include "ash/wm/window_util.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
@@ -60,9 +60,8 @@
const std::string& /* product */) {
UMA_HISTOGRAM_ENUMERATION("PrinterService.PrinterServiceEvent", PRINTER_ADDED,
PRINTER_SERVICE_EVENT_MAX);
- if (!ash::Shell::GetInstance()->session_state_delegate()->
- IsActiveUserSessionStarted() ||
- ash::Shell::GetInstance()->session_state_delegate()->IsScreenLocked()) {
+ if (!ash::Shell::GetInstance()->delegate()->IsSessionStarted() ||
+ ash::Shell::GetInstance()->delegate()->IsScreenLocked()) {
return;
}
« no previous file with comments | « trunk/src/ash/wm/workspace/workspace_layout_manager.cc ('k') | trunk/src/chrome/browser/idle_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698