chromeos: Honor power button when in docked mode.

Ash ignores power button events while the display's
brightness is set to 0%. Make it honor them if an external
display is still on.

BUG=chrome-os-partner:24912

Review URL: https://codereview.chromium.org/177043004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254087 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 6 deletions

diff --git a/chromeos/display/output_configurator.h b/chromeos/display/output_configurator.h
index 89b2e53..571da9a 100644
--- a/chromeos/display/output_configurator.h
+++ b/chromeos/display/output_configurator.h
@@ -184,10 +184,6 @@ class CHROMEOS_EXPORT OutputConfigurator
         : configurator_(configurator) {}
     ~TestApi() {}
 
-    const std::vector<OutputSnapshot>& cached_outputs() const {
-      return configurator_->cached_outputs_;
-    }
-
     // If |configure_timer_| is started, stops the timer, runs
     // ConfigureOutputs(), and returns true; returns false otherwise.
     bool TriggerConfigureTimeout();
@@ -231,6 +227,9 @@ class CHROMEOS_EXPORT OutputConfigurator
 
   ui::OutputState output_state() const { return output_state_; }
   DisplayPowerState power_state() const { return power_state_; }
+  const std::vector<OutputSnapshot>& cached_outputs() const {
+    return cached_outputs_;
+  }
 
   void set_state_controller(StateController* controller) {
     state_controller_ = controller;
diff --git a/chromeos/display/output_configurator_unittest.cc b/chromeos/display/output_configurator_unittest.cc
index 4258dd1..012c2ace 100644
--- a/chromeos/display/output_configurator_unittest.cc
+++ b/chromeos/display/output_configurator_unittest.cc
@@ -1106,7 +1106,7 @@ TEST_F(OutputConfiguratorTest, GetOutputStateForDisplaysWithId) {
 TEST_F(OutputConfiguratorTest, UpdateCachedOutputsEvenAfterFailure) {
   InitWithSingleOutput();
   const std::vector<OutputConfigurator::OutputSnapshot>* cached =
-      &test_api_.cached_outputs();
+      &configurator_.cached_outputs();
   ASSERT_EQ(static_cast<size_t>(1), cached->size());
   EXPECT_EQ(outputs_[0].current_mode, (*cached)[0].current_mode);
 
@@ -1114,7 +1114,7 @@ TEST_F(OutputConfiguratorTest, UpdateCachedOutputsEvenAfterFailure) {
   // |cached_outputs_| even if an invalid state is requested.
   state_controller_.set_state(ui::OUTPUT_STATE_SINGLE);
   UpdateOutputs(2, true);
-  cached = &test_api_.cached_outputs();
+  cached = &configurator_.cached_outputs();
   ASSERT_EQ(static_cast<size_t>(2), cached->size());
   EXPECT_EQ(outputs_[0].current_mode, (*cached)[0].current_mode);
   EXPECT_EQ(outputs_[1].current_mode, (*cached)[1].current_mode);