summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/dbus
diff options
context:
space:
mode:
authorbartfab@google.com <bartfab@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-17 12:21:57 +0000
committerbartfab@google.com <bartfab@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-17 12:21:57 +0000
commit5b5495c70de838b40cc9e5990140fd9b2ad16987 (patch)
treeb5b02aa5e8392edd79a275ffc613c0241e396414 /chrome/browser/chromeos/dbus
parentbac6ffd0f853d003e235a29d51f138ec4d70f034 (diff)
downloadchromium_src-5b5495c70de838b40cc9e5990140fd9b2ad16987.zip
chromium_src-5b5495c70de838b40cc9e5990140fd9b2ad16987.tar.gz
chromium_src-5b5495c70de838b40cc9e5990140fd9b2ad16987.tar.bz2
Add ash SessionStateDelegate
This CL refactors the ShellDelegate by adding a SessionStateDelegate to which methods dealing with the session state can be moved. This cleans up the huge ShellDelegate interface and paves the way for further Chrome OS multiprofile work which will need to add several new methods related to the session state. This CL is only the first step. Several other methods should also move to SessionStateDelegate but I do not want to overburden a single CL. BUG=None TEST=Manual and browser/unit tests TBR=sky (for c/b/idle_chromeos.cc and c/chrome_browser_ui.gypi) Review URL: https://codereview.chromium.org/14295008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/dbus')
-rw-r--r--chrome/browser/chromeos/dbus/printer_service_provider.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/dbus/printer_service_provider.cc b/chrome/browser/chromeos/dbus/printer_service_provider.cc
index 3db81cd..c6d4d74 100644
--- a/chrome/browser/chromeos/dbus/printer_service_provider.cc
+++ b/chrome/browser/chromeos/dbus/printer_service_provider.cc
@@ -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,8 +60,9 @@ void FindOrOpenCloudPrintPage(const std::string& /* vendor */,
const std::string& /* product */) {
UMA_HISTOGRAM_ENUMERATION("PrinterService.PrinterServiceEvent", PRINTER_ADDED,
PRINTER_SERVICE_EVENT_MAX);
- if (!ash::Shell::GetInstance()->delegate()->IsSessionStarted() ||
- ash::Shell::GetInstance()->delegate()->IsScreenLocked()) {
+ if (!ash::Shell::GetInstance()->session_state_delegate()->
+ IsActiveUserSessionStarted() ||
+ ash::Shell::GetInstance()->session_state_delegate()->IsScreenLocked()) {
return;
}