diff options
| author | khorimoto@chromium.org <khorimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-08 00:24:04 +0000 |
|---|---|---|
| committer | khorimoto@chromium.org <khorimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-08 00:24:04 +0000 |
| commit | abc36e5fb04d025d7f18fc327038855b852cb799 (patch) | |
| tree | 18d9f2c7baaef0fb225801b547c24164e07f97ce /chromeos/dbus/power_manager_client.h | |
| parent | 22e94d5234244b17576f2e0c08b864733e8af5f2 (diff) | |
| download | chromium_src-abc36e5fb04d025d7f18fc327038855b852cb799.zip chromium_src-abc36e5fb04d025d7f18fc327038855b852cb799.tar.gz chromium_src-abc36e5fb04d025d7f18fc327038855b852cb799.tar.bz2 | |
Revert 155538 - Replace calls to PowerManagerClient's Notify* methods with SessionManagerClient's methods.
Use SessionManagerClient's NotifyLockScreen{Shown,Dismissed} to have the "locked" status more in-sync.
session_manager broadcasts ScreenIs{Locked,Unlocked} signals and power_manager listens to them and take appropriate action.
See the related changes attached to the bug.
Another following cl will remove powerd's handlers in power_manager.
BUG=chromium-os:32457
TEST=unittests and manually verify you can lock/unlock the screen.
Review URL: https://chromiumcodereview.appspot.com/10905112
TBR=haruki@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10918132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155539 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/power_manager_client.h')
| -rw-r--r-- | chromeos/dbus/power_manager_client.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chromeos/dbus/power_manager_client.h b/chromeos/dbus/power_manager_client.h index 5281531..e910232 100644 --- a/chromeos/dbus/power_manager_client.h +++ b/chromeos/dbus/power_manager_client.h @@ -131,6 +131,12 @@ class CHROMEOS_EXPORT PowerManagerClient { // Requests shutdown of the system. virtual void RequestShutdown() = 0; + // Notifies PowerManager that screen lock has been completed. + virtual void NotifyScreenLockCompleted() = 0; + + // Notifies PowerManager that screen is unlocked. + virtual void NotifyScreenUnlockCompleted() = 0; + // Idle management functions: // Calculates idle time asynchronously, after the idle time request has |