chromeos: Add separate screen dim/off delays for lock screen

chrome/browser/chromeos/power/power_prefs.cc

 // Copyright 2013 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/power/power_prefs.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/dbus/power_policy_controller.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 
 namespace chromeos {
 
 PowerPrefs::PowerPrefs(PowerPolicyController* power_policy_controller)
     : power_policy_controller_(power_policy_controller),
-      profile_(NULL) {
+      profile_(NULL),
+      screen_is_locked_(false) {
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
+                              chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
+                              content::NotificationService::AllSources());
+  notification_registrar_.Add(this,
                               chrome::NOTIFICATION_SESSION_STARTED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_PROFILE_DESTROYED,
                               content::NotificationService::AllSources());
 }
 
 PowerPrefs::~PowerPrefs() {
 }
 
@@ skipping 31 matching lines @@
                          const content::NotificationSource& source,
                          const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE: {
       // Update |profile_| when entering the login screen.
       ProfileManager* profile_manager = g_browser_process->profile_manager();
       if (!profile_manager || !profile_manager->IsLoggedIn())
         SetProfile(ProfileHelper::GetSigninProfile());
       break;
     }
+    case chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED:
+      // Update the policy in case different delays have been set for the lock
+      // screen.
+      screen_is_locked_ = *content::Details<bool>(details).ptr();
+      UpdatePowerPolicyFromPrefs();
+      break;
     case chrome::NOTIFICATION_SESSION_STARTED:
       // Update |profile_| when entering a session.
       SetProfile(ProfileManager::GetPrimaryUserProfile());
       break;
     case chrome::NOTIFICATION_PROFILE_DESTROYED: {
       // Update |profile_| when exiting a session or shutting down.
       Profile* profile = content::Source<Profile>(source).ptr();
       if (profile_ == profile)
         SetProfile(NULL);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
 void PowerPrefs::UpdatePowerPolicyFromPrefs() {
   if (!pref_change_registrar_ || !pref_change_registrar_->prefs()) {
     NOTREACHED();
     return;
   }
 
   const PrefService* prefs = pref_change_registrar_->prefs();
   PowerPolicyController::PrefValues values;
   values.ac_screen_dim_delay_ms =
-      prefs->GetInteger(prefs::kPowerAcScreenDimDelayMs);
+      prefs->GetInteger(screen_is_locked_ ? prefs::kPowerLockScreenDimDelayMs :
+          prefs::kPowerAcScreenDimDelayMs);
   values.ac_screen_off_delay_ms =
-      prefs->GetInteger(prefs::kPowerAcScreenOffDelayMs);
+      prefs->GetInteger(screen_is_locked_ ? prefs::kPowerLockScreenOffDelayMs :
+          prefs::kPowerAcScreenOffDelayMs);
   values.ac_screen_lock_delay_ms =
       prefs->GetInteger(prefs::kPowerAcScreenLockDelayMs);
   values.ac_idle_warning_delay_ms =
       prefs->GetInteger(prefs::kPowerAcIdleWarningDelayMs);
   values.ac_idle_delay_ms =
       prefs->GetInteger(prefs::kPowerAcIdleDelayMs);
   values.battery_screen_dim_delay_ms =
-      prefs->GetInteger(prefs::kPowerBatteryScreenDimDelayMs);
+      prefs->GetInteger(screen_is_locked_ ? prefs::kPowerLockScreenDimDelayMs :
+          prefs::kPowerBatteryScreenDimDelayMs);
   values.battery_screen_off_delay_ms =
-      prefs->GetInteger(prefs::kPowerBatteryScreenOffDelayMs);
+      prefs->GetInteger(screen_is_locked_ ? prefs::kPowerLockScreenOffDelayMs :
+          prefs::kPowerBatteryScreenOffDelayMs);
   values.battery_screen_lock_delay_ms =
       prefs->GetInteger(prefs::kPowerBatteryScreenLockDelayMs);
   values.battery_idle_warning_delay_ms =
       prefs->GetInteger(prefs::kPowerBatteryIdleWarningDelayMs);
   values.battery_idle_delay_ms =
       prefs->GetInteger(prefs::kPowerBatteryIdleDelayMs);
   values.ac_idle_action = static_cast<PowerPolicyController::Action>(
       prefs->GetInteger(prefs::kPowerAcIdleAction));
   values.battery_idle_action = static_cast<PowerPolicyController::Action>(
       prefs->GetInteger(prefs::kPowerBatteryIdleAction));
@@ skipping 54 matching lines @@
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kPowerBatteryIdleWarningDelayMs,
       0,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
       prefs::kPowerBatteryIdleDelayMs,
       600000,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterIntegerPref(
+      prefs::kPowerLockScreenDimDelayMs,
+      30000,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterIntegerPref(
+      prefs::kPowerLockScreenOffDelayMs,
+      40000,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterIntegerPref(
       prefs::kPowerAcIdleAction,
       PowerPolicyController::ACTION_SUSPEND,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kPowerUseAudioActivity,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kPowerUseVideoActivity,
       true,
@@ skipping 46 matching lines @@
   pref_change_registrar_->Add(prefs::kPowerAcIdleDelayMs, update_callback);
   pref_change_registrar_->Add(prefs::kPowerBatteryScreenDimDelayMs,
                               update_callback);
   pref_change_registrar_->Add(prefs::kPowerBatteryScreenOffDelayMs,
                               update_callback);
   pref_change_registrar_->Add(prefs::kPowerBatteryScreenLockDelayMs,
                               update_callback);
   pref_change_registrar_->Add(prefs::kPowerBatteryIdleWarningDelayMs,
                               update_callback);
   pref_change_registrar_->Add(prefs::kPowerBatteryIdleDelayMs, update_callback);
+  pref_change_registrar_->Add(prefs::kPowerLockScreenDimDelayMs,
+                              update_callback);
+  pref_change_registrar_->Add(prefs::kPowerLockScreenOffDelayMs,
+                              update_callback);
   pref_change_registrar_->Add(prefs::kPowerAcIdleAction, update_callback);
   pref_change_registrar_->Add(prefs::kPowerBatteryIdleAction, update_callback);
   pref_change_registrar_->Add(prefs::kPowerLidClosedAction, update_callback);
   pref_change_registrar_->Add(prefs::kPowerUseAudioActivity, update_callback);
   pref_change_registrar_->Add(prefs::kPowerUseVideoActivity, update_callback);
   pref_change_registrar_->Add(prefs::kPowerAllowScreenWakeLocks,
                               update_callback);
   pref_change_registrar_->Add(prefs::kEnableAutoScreenLock, update_callback);
   pref_change_registrar_->Add(prefs::kPowerPresentationScreenDimDelayFactor,
                               update_callback);
   pref_change_registrar_->Add(prefs::kPowerUserActivityScreenDimDelayFactor,
                               update_callback);
   pref_change_registrar_->Add(prefs::kPowerWaitForInitialUserActivity,
                               update_callback);
 
   UpdatePowerPolicyFromPrefs();
 }
 
 }  // namespace chromeos