diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 01:59:45 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-25 01:59:45 +0000 |
| commit | 845260ab832a2f719972be9acc97f73bfce522ce (patch) | |
| tree | 481b8f42ae54b818372ab10d96217d7c7bb3ed41 /chromeos/power | |
| parent | 42690ee3a5ce7670411656c1d4afdd595cec943c (diff) | |
| download | chromium_src-845260ab832a2f719972be9acc97f73bfce522ce.zip chromium_src-845260ab832a2f719972be9acc97f73bfce522ce.tar.gz chromium_src-845260ab832a2f719972be9acc97f73bfce522ce.tar.bz2 | |
chromeos: Fix power override masks.
PowerManagerClient::RequestPowerStateOverrides() takes a
bitmap of OR-ed together PowerStateOverrideType values, but
the values from that enum were 1, 2, 3, and 4 instead of
using distinct bits.
I'm also switching the 'duration' parameter to be a
base::TimeDelta so people don't need to read the power
manager source code to figure out what to pass.
BUG=114128
Review URL: https://chromiumcodereview.appspot.com/10991006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/power')
| -rw-r--r-- | chromeos/power/power_state_override.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromeos/power/power_state_override.cc b/chromeos/power/power_state_override.cc index 20582ca..2383f80 100644 --- a/chromeos/power/power_state_override.cc +++ b/chromeos/power/power_state_override.cc @@ -70,7 +70,8 @@ void PowerStateOverride::CallRequestPowerStateOverrides() { if (power_manager) { power_manager->RequestPowerStateOverrides( request_id_, - kHeartbeatTimeInSecs + kRequestSlackInSecs, + base::TimeDelta::FromSeconds( + kHeartbeatTimeInSecs + kRequestSlackInSecs), override_types_, base::Bind(&PowerStateOverride::SetRequestId, weak_ptr_factory_.GetWeakPtr())); |