From 77894b4bd8771c77112a41e19d95094c09853229 Mon Sep 17 00:00:00 2001
From: "derat@chromium.org"
 <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 29 Jan 2013 17:05:14 +0000
Subject: chromeos: Support delaying suspend asynchronously.

This adds PowerManagerClient::GetSuspendReadinessCallback(),
which PowerManagerClient::Observer implementations can call
from within SuspendImminent().  The method returns a Closure
that the observer can call after doing asynchronous work to
report that it's ready for the system to be suspended.

It also makes SessionManagerClient listen for ScreenIsLocked
and ScreenIsUnlocked signals and removes an unused
GetIsScreenLocked() method.

BUG=171960,128798

Review URL: https://codereview.chromium.org/12095006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179350 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/chromeos/settings/device_settings_test_helper.cc | 4 ----
 chrome/browser/chromeos/settings/device_settings_test_helper.h  | 1 -
 2 files changed, 5 deletions(-)

(limited to 'chrome/browser/chromeos/settings')

diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
index e573422..6525ddc 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.cc
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
@@ -124,10 +124,6 @@ void DeviceSettingsTestHelper::RequestUnlockScreen() {}
 
 void DeviceSettingsTestHelper::NotifyLockScreenDismissed() {}
 
-bool DeviceSettingsTestHelper::GetIsScreenLocked() {
-  return false;
-}
-
 void DeviceSettingsTestHelper::RetrieveDevicePolicy(
     const RetrievePolicyCallback& callback) {
   device_policy_.retrieve_callbacks_.push_back(callback);
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
index 35454c2..0aacc82 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -92,7 +92,6 @@ class DeviceSettingsTestHelper : public SessionManagerClient {
   virtual void NotifyLockScreenShown() OVERRIDE;
   virtual void RequestUnlockScreen() OVERRIDE;
   virtual void NotifyLockScreenDismissed() OVERRIDE;
-  virtual bool GetIsScreenLocked() OVERRIDE;
   virtual void RetrieveDevicePolicy(
       const RetrievePolicyCallback& callback) OVERRIDE;
   virtual void RetrieveUserPolicy(
-- 
cgit v1.1