Move chromeos specific utility functions for display to chromeos/display

chromeos/display/output_configurator.cc

Index: chromeos/display/output_configurator.cc
diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc
index 903f49b7e9368736c07080d9017ed03f425b0a9e..affca4bab84ca457a783a98d2e5436e56fad9415 100644
--- a/chromeos/display/output_configurator.cc
+++ b/chromeos/display/output_configurator.cc
@@ -12,16 +12,13 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time.h"
+#include "chromeos/display/output_util.h"
 #include "chromeos/display/real_output_configurator_delegate.h"
 
 namespace chromeos {
 
 namespace {
 
-// Prefixes for the built-in displays.
-const char kInternal_LVDS[] = "LVDS";
-const char kInternal_eDP[] = "eDP";
-
 // The delay to perform configuration after RRNotify.  See the comment
 // in |Dispatch()|.
 const int64 kConfigureDelayMs = 500;
@@ -92,7 +89,8 @@ OutputConfigurator::OutputSnapshot::OutputSnapshot()
       height(0),
       is_internal(false),
       is_aspect_preserving_scaling(false),
-      touch_device_id(0) {}
+      touch_device_id(0),
+      display_id(-1) {}

[Jun Mukai, 2013/05/14 07:03:02]

can't we use gfx::Display::kInvalidDisplayID?

 
 OutputConfigurator::CoordinateTransformation::CoordinateTransformation()
   : x_scale(1.0),
@@ -141,11 +139,6 @@ bool OutputConfigurator::TestApi::SendOutputChangeEvents(bool connected) {
   return true;
 }
 
-// static
-bool OutputConfigurator::IsInternalOutputName(const std::string& name) {
-  return name.find(kInternal_LVDS) == 0 || name.find(kInternal_eDP) == 0;
-}
-
 OutputConfigurator::OutputConfigurator()
     : state_controller_(NULL),
       configure_display_(base::chromeos::IsRunningOnChromeOS()),
@@ -510,13 +503,10 @@ OutputState OutputConfigurator::GetOutputState(
       } else {
         // With either both outputs on or both outputs off, use one of the
         // dual modes.
-        std::vector<OutputInfo> output_infos;
-        for (size_t i = 0; i < outputs.size(); ++i) {
-          output_infos.push_back(OutputInfo());
-          output_infos[i].output = outputs[i].output;
-          output_infos[i].output_index = i;
-        }
-        return state_controller_->GetStateForOutputs(output_infos);
+        std::vector<int64> display_ids;
+        for (size_t i = 0; i < outputs.size(); ++i)
+          display_ids.push_back(outputs[i].display_id);
+        return state_controller_->GetStateForDisplayIds(display_ids);
       }
     }
     default: