chromeos: Move default power management policy into Chrome.

chrome/browser/chromeos/preferences.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/preferences.h"
 
 #include "ash/magnifier/magnifier_constants.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 265 matching lines @@
   // TODO(wad): Once UI is connected, a final default can be set. At that point
   // change this pref from UNSYNCABLE to SYNCABLE.
   registry->RegisterBooleanPref(prefs::kEnableCrosDRM,
                                 true,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   registry->RegisterBooleanPref(prefs::kExternalStorageDisabled,
                                 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);
   registry->RegisterIntegerPref(prefs::kPowerAcScreenOffDelayMs,
                                 480000,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(prefs::kPowerAcScreenLockDelayMs,
-                                600000,
+                                0,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(prefs::kPowerAcIdleWarningDelayMs,
                                 0,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(prefs::kPowerAcIdleDelayMs,
                                 1800000,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(prefs::kPowerBatteryScreenDimDelayMs,
                                 300000,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(prefs::kPowerBatteryScreenOffDelayMs,
                                 360000,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(prefs::kPowerBatteryScreenLockDelayMs,
-                                600000,
+                                0,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(prefs::kPowerBatteryIdleWarningDelayMs,
                                 0,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(prefs::kPowerBatteryIdleDelayMs,
                                 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,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(prefs::kPowerUseVideoActivity,
                                 true,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterDoublePref(prefs::kPowerPresentationIdleDelayFactor,
                                2.0,
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ skipping 88 matching lines @@
       prefs::kLanguageXkbAutoRepeatEnabled, prefs, callback);
   xkb_auto_repeat_delay_pref_.Init(
       prefs::kLanguageXkbAutoRepeatDelay, prefs, callback);
   xkb_auto_repeat_interval_pref_.Init(
       prefs::kLanguageXkbAutoRepeatInterval, prefs, callback);
 
   enable_screen_lock_.Init(prefs::kEnableScreenLock, prefs, callback);
 
   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) {
   InitUserPrefs(prefs);
 
   // This causes OnIsSyncingChanged to be called when the value of
   // PrefService::IsSyncing() changes.
   prefs->AddObserver(this);
 
   // Initialize preferences to currently saved state.
@@ skipping 281 matching lines @@
   // selected and Drive is disabled.
   if (!pref_name || *pref_name == prefs::kDisableDrive) {
     if (disable_drive_.GetValue()) {
       if (drive::util::IsUnderDriveMountPoint(
           download_default_directory_.GetValue())) {
         prefs_->SetFilePath(prefs::kDownloadDefaultDirectory,
                             download_util::GetDefaultDownloadDirectory());
       }
     }
   }
-
-  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() {
   DVLOG(1) << "OnIsSyncingChanged";
   ForceNaturalScrollDefault();
 }
 
 void Preferences::ForceNaturalScrollDefault() {
   DVLOG(1) << "ForceNaturalScrollDefault";
   if (CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 97 matching lines @@
 
   input_method::AutoRepeatRate rate;
   rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();
   rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();
   DCHECK(rate.initial_delay_in_ms > 0);
   DCHECK(rate.repeat_interval_in_ms > 0);
   input_method::XKeyboard::SetAutoRepeatRate(rate);
 }
 
 }  // namespace chromeos