[Night Light] CL11: Enhancements

ash/system/night_light/night_light_controller.cc

 // Copyright 2017 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 "ash/system/night_light/night_light_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/public/cpp/ash_pref_names.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
@@ skipping 12 matching lines @@
 // Default start time at 6:00 PM as an offset from 00:00.
 const int kDefaultStartTimeOffsetMinutes = 18 * 60;
 
 // Default end time at 6:00 AM as an offset from 00:00.
 const int kDefaultEndTimeOffsetMinutes = 6 * 60;
 
 constexpr float kDefaultColorTemperature = 0.5f;
 
 // The duration of the temperature change animation for
 // AnimationDurationType::kShort.
-constexpr int kManualAnimationDurationSec = 2;
+constexpr base::TimeDelta kManualAnimationDuration =
+    base::TimeDelta::FromSeconds(1);
 
 // The duration of the temperature change animation for
 // AnimationDurationType::kLong.
-constexpr int kAutomaticAnimationDurationSec = 20;
+constexpr base::TimeDelta kAutomaticAnimationDuration =
+    base::TimeDelta::FromSeconds(20);
 
 class NightLightControllerDelegateImpl : public NightLightController::Delegate {
  public:
   NightLightControllerDelegateImpl() = default;
   ~NightLightControllerDelegateImpl() override = default;
 
   // ash::NightLightController::Delegate:
   base::Time GetNow() const override { return base::Time::Now(); }
   base::Time GetSunsetTime() const override { return GetSunRiseSet(false); }
   base::Time GetSunriseTime() const override { return GetSunRiseSet(true); }
@@ skipping 204 matching lines @@
     NotifyClientWithScheduleChange();
   }
 }
 
 void NightLightController::SetDelegateForTesting(
     std::unique_ptr<Delegate> delegate) {
   delegate_ = std::move(delegate);
 }
 
 void NightLightController::RefreshLayersTemperature() {
-  ApplyColorTemperatureToLayers(
-      GetEnabled() ? GetColorTemperature() : 0.0f,
-      base::TimeDelta::FromSeconds(animation_duration_ ==
-                                           AnimationDuration::kShort
-                                       ? kManualAnimationDurationSec
-                                       : kAutomaticAnimationDurationSec));
+  ApplyColorTemperatureToLayers(GetEnabled() ? GetColorTemperature() : 0.0f,
+                                animation_duration_ == AnimationDuration::kShort
+                                    ? kManualAnimationDuration
+                                    : kAutomaticAnimationDuration);
 
   // Reset the animation type back to manual to consume any automatically set
   // animations.
   last_animation_duration_ = animation_duration_;
   animation_duration_ = AnimationDuration::kShort;
   Shell::Get()->SetCursorCompositingEnabled(GetEnabled());
 }
 
 void NightLightController::StartWatchingPrefsChanges() {
   DCHECK(active_user_pref_service_);
@@ skipping 183 matching lines @@
 }
 
 void NightLightController::ScheduleNextToggle(base::TimeDelta delay) {
   timer_.Start(
       FROM_HERE, delay,
       base::Bind(&NightLightController::SetEnabled, base::Unretained(this),
                  !GetEnabled(), AnimationDuration::kLong));
 }
 
 }  // namespace ash