diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 20:32:18 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 20:32:18 +0000 |
| commit | 16f3e30d213bd3708591d6a513889e395c485ac8 (patch) | |
| tree | 2bdf875eb28b8ecdb6f79cd2600799cad5502376 /chromeos/dbus/mock_session_manager_client.h | |
| parent | c6f57f9e22339c7beb608a67ac9bb90425ed84e6 (diff) | |
| download | chromium_src-16f3e30d213bd3708591d6a513889e395c485ac8.zip chromium_src-16f3e30d213bd3708591d6a513889e395c485ac8.tar.gz chromium_src-16f3e30d213bd3708591d6a513889e395c485ac8.tar.bz2 | |
chromeos: Request screen lock directly from session manager.
Screen lock and unlock requests were previously sent to
powerd, which just forwarded them on to the session manager
without doing anything extra. It's simpler for Chrome to
just ask the session manager to lock or unlock directly.
I'm also moving the LockScreen and UnlockScreen
notifications from PowerManagerClient::Observer to
SessionManagerClient::Observer. Confusingly, the signals
that prompt those notifications are sent by the session
manager but were being listened for in PowerManagerClient.
BUG=chromium-os:24003
TEST=manual: able to lock the screen from the UI, power button, and by closing the lid; unlocking works too
Review URL: https://chromiumcodereview.appspot.com/10693087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/mock_session_manager_client.h')
| -rw-r--r-- | chromeos/dbus/mock_session_manager_client.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chromeos/dbus/mock_session_manager_client.h b/chromeos/dbus/mock_session_manager_client.h index b8632b54..2ea212fe 100644 --- a/chromeos/dbus/mock_session_manager_client.h +++ b/chromeos/dbus/mock_session_manager_client.h @@ -19,12 +19,16 @@ class MockSessionManagerClient : public SessionManagerClient { MOCK_METHOD1(AddObserver, void(Observer*)); MOCK_METHOD1(RemoveObserver, void(Observer*)); + MOCK_METHOD1(HasObserver, bool(Observer*)); MOCK_METHOD0(EmitLoginPromptReady, void(void)); MOCK_METHOD0(EmitLoginPromptVisible, void(void)); MOCK_METHOD0(RestartEntd, void(void)); MOCK_METHOD2(RestartJob, void(int, const std::string&)); MOCK_METHOD1(StartSession, void(const std::string&)); MOCK_METHOD0(StopSession, void(void)); + MOCK_METHOD0(RequestLockScreen, void(void)); + MOCK_METHOD0(RequestUnlockScreen, void(void)); + MOCK_METHOD0(GetIsScreenLocked, bool(void)); MOCK_METHOD1(RetrieveDevicePolicy, void(const RetrievePolicyCallback&)); MOCK_METHOD1(RetrieveUserPolicy, void(const RetrievePolicyCallback&)); MOCK_METHOD2(StoreDevicePolicy, void(const std::string&, |