Remove DisplayState from the public interface for DisplayConfigurator

ui/display/chromeos/display_util.cc

 // Copyright 2014 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 "ui/display/chromeos/display_util.h"
 
+#include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "ui/display/types/display_snapshot.h"
 
 namespace ui {
 
 std::string DisplayPowerStateToString(chromeos::DisplayPowerState state) {
   switch (state) {
     case chromeos::DISPLAY_POWER_ALL_ON:
       return "ALL_ON";
@@ skipping 20 matching lines @@
       return "DUAL_MIRROR";
     case MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED:
       return "DUAL_EXTENDED";
     case MULTIPLE_DISPLAY_STATE_MULTI_EXTENDED:
       return "MULTI_EXTENDED";
   }
   NOTREACHED() << "Unknown state " << state;
   return "INVALID";
 }
 
-int GetDisplayPower(
-    const std::vector<DisplayConfigurator::DisplayState>& display_states,
-    chromeos::DisplayPowerState state,
-    std::vector<bool>* display_power) {
+int GetDisplayPower(const std::vector<DisplaySnapshot*>& displays,
+                    chromeos::DisplayPowerState state,
+                    std::vector<bool>* display_power) {
   int num_on_displays = 0;
   if (display_power)
-    display_power->resize(display_states.size());
+    display_power->resize(displays.size());
 
-  for (size_t i = 0; i < display_states.size(); ++i) {
-    bool internal =
-        display_states[i].display->type() == DISPLAY_CONNECTION_TYPE_INTERNAL;
+  for (size_t i = 0; i < displays.size(); ++i) {
+    bool internal = displays[i]->type() == DISPLAY_CONNECTION_TYPE_INTERNAL;
     bool on =
         state == chromeos::DISPLAY_POWER_ALL_ON ||
         (state == chromeos::DISPLAY_POWER_INTERNAL_OFF_EXTERNAL_ON &&
          !internal) ||
         (state == chromeos::DISPLAY_POWER_INTERNAL_ON_EXTERNAL_OFF && internal);
     if (display_power)
       (*display_power)[i] = on;
     if (on)
       num_on_displays++;
   }
   return num_on_displays;
 }
 
 }  // namespace ui