Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2446)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/preferences.cc

Issue 14134004: chromeos: Move default power management policy into Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: change char pointers in PrefNames to std::strings Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chromeos/chromeos.gyp » ('j') | chromeos/dbus/power_policy_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/preferences.cc
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 4f40880544aca37365b2c57aced7f3a73664f875..bf76b832f9865aae48f49877757e458373466308 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -283,13 +283,6 @@ void Preferences::RegisterUserPrefs(PrefRegistrySyncable* registry) {
false,
PrefRegistrySyncable::UNSYNCABLE_PREF);
- // TODO(derat): Right now, these values are just copied from powerd's
- // defaults. Make this file be the canonical source of default power
- // management settings. Note that these prefs' default values aren't
- // currently expressive enough to convey powerd's default behavior, e.g.
- // powerd shuts down instead of suspending when no user is logged in, and
- // the default screen-lock delays are only used when
- // prefs::kEnableScreenLock is set.
registry->RegisterIntegerPref(prefs::kPowerAcScreenDimDelayMs,
420000,
PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ -297,7 +290,7 @@ void Preferences::RegisterUserPrefs(PrefRegistrySyncable* registry) {
480000,
PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterIntegerPref(prefs::kPowerAcScreenLockDelayMs,
- 600000,
+ 0,
PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterIntegerPref(prefs::kPowerAcIdleWarningDelayMs,
0,
@@ -312,7 +305,7 @@ void Preferences::RegisterUserPrefs(PrefRegistrySyncable* registry) {
360000,
PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterIntegerPref(prefs::kPowerBatteryScreenLockDelayMs,
- 600000,
+ 0,
PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterIntegerPref(prefs::kPowerBatteryIdleWarningDelayMs,
0,
@@ -321,10 +314,10 @@ void Preferences::RegisterUserPrefs(PrefRegistrySyncable* registry) {
600000,
PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterIntegerPref(prefs::kPowerIdleAction,
- chromeos::PowerPolicyController::ACTION_SUSPEND,
+ PowerPolicyController::ACTION_SUSPEND,
PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterIntegerPref(prefs::kPowerLidClosedAction,
- chromeos::PowerPolicyController::ACTION_SUSPEND,
+ PowerPolicyController::ACTION_SUSPEND,
PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterBooleanPref(prefs::kPowerUseAudioActivity,
true,
@@ -433,33 +426,31 @@ void Preferences::InitUserPrefs(PrefServiceSyncable* prefs) {
enable_drm_.Init(prefs::kEnableCrosDRM, prefs, callback);
- power_ac_screen_dim_delay_ms_.Init(
- prefs::kPowerAcScreenDimDelayMs, prefs, callback);
- power_ac_screen_off_delay_ms_.Init(
- prefs::kPowerAcScreenOffDelayMs, prefs, callback);
- power_ac_screen_lock_delay_ms_.Init(
- prefs::kPowerAcScreenLockDelayMs, prefs, callback);
- power_ac_idle_warning_delay_ms_.Init(
- prefs::kPowerAcIdleWarningDelayMs, prefs, callback);
- power_ac_idle_delay_ms_.Init(prefs::kPowerAcIdleDelayMs, prefs, callback);
- power_battery_screen_dim_delay_ms_.Init(
- prefs::kPowerBatteryScreenDimDelayMs, prefs, callback);
- power_battery_screen_off_delay_ms_.Init(
- prefs::kPowerBatteryScreenOffDelayMs, prefs, callback);
- power_battery_screen_lock_delay_ms_.Init(
- prefs::kPowerBatteryScreenLockDelayMs, prefs, callback);
- power_battery_idle_warning_delay_ms_.Init(
- prefs::kPowerBatteryIdleWarningDelayMs, prefs, callback);
- power_battery_idle_delay_ms_.Init(
- prefs::kPowerBatteryIdleDelayMs, prefs, callback);
- power_idle_action_.Init(prefs::kPowerIdleAction, prefs, callback);
- power_lid_closed_action_.Init(prefs::kPowerLidClosedAction, prefs, callback);
- power_use_audio_activity_.Init(
- prefs::kPowerUseAudioActivity, prefs, callback);
- power_use_video_activity_.Init(
- prefs::kPowerUseVideoActivity, prefs, callback);
- power_presentation_idle_delay_factor_.Init(
- prefs::kPowerPresentationIdleDelayFactor, prefs, callback);
+ PowerPolicyController::PrefNames power_pref_names;
+ power_pref_names.ac_screen_dim_delay_ms = prefs::kPowerAcScreenDimDelayMs;
+ power_pref_names.ac_screen_off_delay_ms = prefs::kPowerAcScreenOffDelayMs;
+ power_pref_names.ac_screen_lock_delay_ms = prefs::kPowerAcScreenLockDelayMs;
+ power_pref_names.ac_idle_warning_delay_ms = prefs::kPowerAcIdleWarningDelayMs;
+ power_pref_names.ac_idle_delay_ms = prefs::kPowerAcIdleDelayMs;
+ power_pref_names.battery_screen_dim_delay_ms =
+ prefs::kPowerBatteryScreenDimDelayMs;
+ power_pref_names.battery_screen_off_delay_ms =
+ prefs::kPowerBatteryScreenOffDelayMs;
+ power_pref_names.battery_screen_lock_delay_ms =
+ prefs::kPowerBatteryScreenLockDelayMs;
+ power_pref_names.battery_idle_warning_delay_ms =
+ prefs::kPowerBatteryIdleWarningDelayMs;
+ power_pref_names.battery_idle_delay_ms =
+ prefs::kPowerBatteryIdleDelayMs;
+ power_pref_names.idle_action = prefs::kPowerIdleAction;
+ power_pref_names.lid_closed_action = prefs::kPowerLidClosedAction;
+ power_pref_names.use_audio_activity = prefs::kPowerUseAudioActivity;
+ power_pref_names.use_video_activity = prefs::kPowerUseVideoActivity;
+ power_pref_names.enable_screen_lock = prefs::kEnableScreenLock;
+ power_pref_names.presentation_idle_delay_factor =
+ prefs::kPowerPresentationIdleDelayFactor;
+ DBusThreadManager::Get()->GetPowerPolicyController()->InitPrefs(
+ prefs, power_pref_names);
}
void Preferences::Init(PrefServiceSyncable* prefs) {
@@ -761,40 +752,6 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) {
}
}
}
-
- if (!pref_name ||
- *pref_name == prefs::kPowerAcScreenDimDelayMs ||
- *pref_name == prefs::kPowerAcScreenOffDelayMs ||
- *pref_name == prefs::kPowerAcScreenLockDelayMs ||
- *pref_name == prefs::kPowerAcIdleWarningDelayMs ||
- *pref_name == prefs::kPowerAcIdleDelayMs ||
- *pref_name == prefs::kPowerBatteryScreenDimDelayMs ||
- *pref_name == prefs::kPowerBatteryScreenOffDelayMs ||
- *pref_name == prefs::kPowerBatteryScreenLockDelayMs ||
- *pref_name == prefs::kPowerBatteryIdleWarningDelayMs ||
- *pref_name == prefs::kPowerBatteryIdleDelayMs ||
- *pref_name == prefs::kPowerIdleAction ||
- *pref_name == prefs::kPowerLidClosedAction ||
- *pref_name == prefs::kPowerUseAudioActivity ||
- *pref_name == prefs::kPowerUseVideoActivity ||
- *pref_name == prefs::kPowerPresentationIdleDelayFactor) {
- DBusThreadManager::Get()->GetPowerPolicyController()->UpdatePolicyFromPrefs(
- *prefs_->FindPreference(prefs::kPowerAcScreenDimDelayMs),
- *prefs_->FindPreference(prefs::kPowerAcScreenOffDelayMs),
- *prefs_->FindPreference(prefs::kPowerAcScreenLockDelayMs),
- *prefs_->FindPreference(prefs::kPowerAcIdleWarningDelayMs),
- *prefs_->FindPreference(prefs::kPowerAcIdleDelayMs),
- *prefs_->FindPreference(prefs::kPowerBatteryScreenDimDelayMs),
- *prefs_->FindPreference(prefs::kPowerBatteryScreenOffDelayMs),
- *prefs_->FindPreference(prefs::kPowerBatteryScreenLockDelayMs),
- *prefs_->FindPreference(prefs::kPowerBatteryIdleWarningDelayMs),
- *prefs_->FindPreference(prefs::kPowerBatteryIdleDelayMs),
- *prefs_->FindPreference(prefs::kPowerIdleAction),
- *prefs_->FindPreference(prefs::kPowerLidClosedAction),
- *prefs_->FindPreference(prefs::kPowerUseAudioActivity),
- *prefs_->FindPreference(prefs::kPowerUseVideoActivity),
- *prefs_->FindPreference(prefs::kPowerPresentationIdleDelayFactor));
- }
}
void Preferences::OnIsSyncingChanged() {
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chromeos/chromeos.gyp » ('j') | chromeos/dbus/power_policy_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698