[Cast] Change screen power off API

Due to internal changes, it makes more sense to have display settings
manager own whether the screen should power off, so reverting the screen
off API to that state and adding a new call for setting whether it
should power off.

BUG=b/156411764
TEST=Build, flash to device, check behaviour

Change-Id: Ib395a96ef7385640ee0bd36e0907f96c73dcd85a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2316666Reviewed-by: Alex Gough <ajgo@chromium.org>
Reviewed-by: Daniel Nicoara <dnicoara@chromium.org>
Commit-Queue: Eric Ye <ericye@google.com>
Cr-Commit-Position: refs/heads/master@{#791313}

chromecast/ui/display_settings_manager_impl.cc

@@ -59,6 +59,7 @@ DisplaySettingsManagerImpl::DisplaySettingsManagerImpl(
       screen_on_(true),
 #if defined(USE_AURA)
       screen_power_on_(true),
+      allow_screen_power_off_(false),
 #endif  // defined(USE_AURA)
       color_temperature_animation_(std::make_unique<ColorTemperatureAnimation>(
           window_manager_,
@@ -189,13 +190,12 @@ void DisplaySettingsManagerImpl::OnDisplayOffTimeoutCompleted() {
   screen_power_on_ = false;
 }
 
-void DisplaySettingsManagerImpl::SetScreenOn(bool screen_on,
-                                             bool display_power) {
+void DisplaySettingsManagerImpl::SetScreenOn(bool screen_on) {
   // Allow this to run if screen_on == screen_on_ == false IF
   // previously, the screen was turned off without powering off the screen
   // and we want to power it off this time
   if (screen_on == screen_on_ &&
-      !(!screen_on && !display_power && screen_power_on_)) {
+      !(!screen_on && allow_screen_power_off_ && screen_power_on_)) {
     return;
   }
 
@@ -210,7 +210,7 @@ void DisplaySettingsManagerImpl::SetScreenOn(bool screen_on,
   } else {
     UpdateBrightness(kScreenOnOffDuration);
     window_manager_->SetTouchInputDisabled(!screen_on_);
-    if (!screen_on && !display_power) {
+    if (!screen_on && allow_screen_power_off_) {
       base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
           FROM_HERE,
           base::BindOnce(
@@ -220,9 +220,12 @@ void DisplaySettingsManagerImpl::SetScreenOn(bool screen_on,
     }
   }
 }
+
+void DisplaySettingsManagerImpl::SetAllowScreenPowerOff(bool allow_power_off) {
+  allow_screen_power_off_ = allow_power_off;
+}
 #else
-void DisplaySettingsManagerImpl::SetScreenOn(bool screen_on,
-                                             bool display_power) {
+void DisplaySettingsManagerImpl::SetScreenOn(bool screen_on) {
   if (screen_on == screen_on_) {
     return;
   }
@@ -233,6 +236,7 @@ void DisplaySettingsManagerImpl::SetScreenOn(bool screen_on,
   UpdateBrightness(kScreenOnOffDuration);
   window_manager_->SetTouchInputDisabled(!screen_on_);
 }
+void DisplaySettingsManagerImpl::SetAllowScreenPowerOff(bool allow_power_off) {}
 #endif
 
 void DisplaySettingsManagerImpl::AddDisplaySettingsObserver(

chromecast/ui/display_settings_manager_impl.h

@@ -62,7 +62,8 @@ class DisplaySettingsManagerImpl : public DisplaySettingsManager,
   void SetBrightness(float brightness) override;
   void SetBrightnessSmooth(float brightness, base::TimeDelta duration) override;
   void ResetBrightness() override;
-  void SetScreenOn(bool screen_on, bool display_power) override;
+  void SetScreenOn(bool screen_on) override;
+  void SetAllowScreenPowerOff(bool allow_power_off) override;
 
  private:
   // mojom::DisplaySettingsObserver implementation
@@ -87,6 +88,7 @@ class DisplaySettingsManagerImpl : public DisplaySettingsManager,
   bool screen_on_;
 #if defined(USE_AURA)
   bool screen_power_on_;
+  bool allow_screen_power_off_;
 #endif  // defined(USE_AURA)
 
   std::unique_ptr<ColorTemperatureAnimation> color_temperature_animation_;

chromecast/ui/mojom/display_settings.mojom

@@ -28,10 +28,10 @@ interface DisplaySettings {
 
   // Sets whether screen should be on. If set to false, then screen will always
   // be off and other settings will not be applied.
-  // |display_on| is false, and |display_power| is false, power off the
-  // display. |display_power| is ignored if |display_on| is true (since
-  // display cannot turn on without display power)
-  SetScreenOn(bool display_on, bool display_power);
+  SetScreenOn(bool display_on);
+
+  // Sets whether the screen should power off when SetScreenOn(false) is called.
+  SetAllowScreenPowerOff(bool allow_power_off);
 
   // Adds an observer to DisplaySettings.
   AddDisplaySettingsObserver(pending_remote<DisplaySettingsObserver> observer);