Move chromeos specific utility functions for display to chromeos/display

chromeos/display/output_configurator.cc

 // Copyright (c) 2012 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 "chromeos/display/output_configurator.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #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;
 
 // Returns a string describing |state|.
 std::string DisplayPowerStateToString(DisplayPowerState state) {
   switch (state) {
     case DISPLAY_POWER_ALL_ON:
       return "ALL_ON";
     case DISPLAY_POWER_ALL_OFF:
@@ skipping 51 matching lines @@
     : output(None),
       crtc(None),
       current_mode(None),
       native_mode(None),
       mirror_mode(None),
       y(0),
       height(0),
       is_internal(false),
       is_aspect_preserving_scaling(false),
       touch_device_id(0),
-      index(0) {}
+      display_id(0),

[Jun Mukai, 2013/05/14 17:29:33]

why did you change to 0?

[oshima, 2013/05/15 00:59:17]

I want this to be consistent with other fields (which are initialized to 0). The
value doesn't matter b/c initial value won't be used.

+      has_display_id(false) {}
 
 OutputConfigurator::CoordinateTransformation::CoordinateTransformation()
   : x_scale(1.0),
     x_offset(0.0),
     y_scale(1.0),
     y_offset(0.0) {}
 
 OutputConfigurator::CrtcConfig::CrtcConfig()
     : crtc(None),
       x(0),
@@ skipping 28 matching lines @@
 
   if (!configurator_->configure_timer_->IsRunning()) {
     LOG(ERROR) << "ConfigureOutputs() timer not running";
     return false;
   }
 
   configurator_->ConfigureOutputs();
   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()),
       xrandr_event_base_(0),
       output_state_(STATE_INVALID),
       power_state_(DISPLAY_POWER_ALL_ON) {
 }
 
 OutputConfigurator::~OutputConfigurator() {}
 
@@ skipping 345 matching lines @@
     case 1:
       return STATE_SINGLE;
     case 2: {
       if (num_on_outputs == 1) {
         // If only one output is currently turned on, return the "single"
         // state so that its native mode will be used.
         return STATE_SINGLE;
       } else {
         // With either both outputs on or both outputs off, use one of the
         // dual modes.
-        return state_controller_->GetStateForOutputs(outputs);
+        std::vector<int64> display_ids;
+        for (size_t i = 0; i < outputs.size(); ++i) {
+          // If display id isn't available, switch to extended mode.
+          if (!outputs[i].has_display_id)
+            return STATE_DUAL_EXTENDED;
+          display_ids.push_back(outputs[i].display_id);
+        }
+        return state_controller_->GetStateForDisplayIds(display_ids);
       }
     }
     default:
       NOTREACHED();
   }
   return STATE_INVALID;
 }
 
 OutputConfigurator::CoordinateTransformation
 OutputConfigurator::GetMirrorModeCTM(
@@ skipping 52 matching lines @@
   float width_ratio = static_cast<float>(mirror_mode_width) /
       static_cast<float>(native_mode_width);
   float height_ratio = static_cast<float>(mirror_mode_height) /
       static_cast<float>(native_mode_height);
 
   area_ratio = width_ratio * height_ratio;
   return area_ratio;
 }
 
 }  // namespace chromeos