diff options
| author | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 14:47:48 +0000 |
|---|---|---|
| committer | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 14:47:48 +0000 |
| commit | f2192efaf719d6e54459fde8ef38093e08e194e0 (patch) | |
| tree | 26b06fa106a8ab701dcda5e4c00f959d9d82a700 /chrome/browser/chromeos/dbus | |
| parent | b0b94f5c503e44cc2190a9c7c4d20425f77e6a42 (diff) | |
| download | chromium_src-f2192efaf719d6e54459fde8ef38093e08e194e0.zip chromium_src-f2192efaf719d6e54459fde8ef38093e08e194e0.tar.gz chromium_src-f2192efaf719d6e54459fde8ef38093e08e194e0.tar.bz2 | |
Revert 194578 "Add ash SessionStateDelegate"
> 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
TBR=bartfab@google.com
Review URL: https://codereview.chromium.org/14200034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/dbus')
| -rw-r--r-- | chrome/browser/chromeos/dbus/printer_service_provider.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/dbus/printer_service_provider.cc b/chrome/browser/chromeos/dbus/printer_service_provider.cc index c6d4d74..3db81cd 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,9 +60,8 @@ 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()->session_state_delegate()-> - IsActiveUserSessionStarted() || - ash::Shell::GetInstance()->session_state_delegate()->IsScreenLocked()) { + if (!ash::Shell::GetInstance()->delegate()->IsSessionStarted() || + ash::Shell::GetInstance()->delegate()->IsScreenLocked()) { return; } |