diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 18:21:31 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 18:21:31 +0000 |
| commit | ceaf3a147251731ca82051c4d42de94e793a93ca (patch) | |
| tree | a5831676a763d14b5dbcd4d9a2aa74730bb01e47 /content | |
| parent | de059facfbe5010fb882952d31d056d739e9f4f0 (diff) | |
| download | chromium_src-ceaf3a147251731ca82051c4d42de94e793a93ca.zip chromium_src-ceaf3a147251731ca82051c4d42de94e793a93ca.tar.gz chromium_src-ceaf3a147251731ca82051c4d42de94e793a93ca.tar.bz2 | |
chromeos: Add "allow screen wake locks" pref.
This adds a pref that enterprises can set to prevent
screen-related power management (including screen-locking)
from being overridden via the chrome.power extension API.
BUG=226073,236827
Review URL: https://chromiumcodereview.appspot.com/14556004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/power_save_blocker_chromeos.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/power_save_blocker_chromeos.cc b/content/browser/power_save_blocker_chromeos.cc index e19dfbc..9eda5c4 100644 --- a/content/browser/power_save_blocker_chromeos.cc +++ b/content/browser/power_save_blocker_chromeos.cc @@ -36,10 +36,10 @@ class PowerSaveBlockerImpl::Delegate chromeos::DBusThreadManager::Get()->GetPowerPolicyController(); switch (type_) { case kPowerSaveBlockPreventAppSuspension: - block_id_ = controller->AddSuspendBlock(reason_); + block_id_ = controller->AddSystemWakeLock(reason_); break; case kPowerSaveBlockPreventDisplaySleep: - block_id_ = controller->AddScreenBlock(reason_); + block_id_ = controller->AddScreenWakeLock(reason_); break; default: NOTREACHED() << "Unhandled block type " << type_; @@ -53,7 +53,7 @@ class PowerSaveBlockerImpl::Delegate return; } chromeos::DBusThreadManager::Get()->GetPowerPolicyController()-> - RemoveBlock(block_id_); + RemoveWakeLock(block_id_); } private: |