Move chromeos specific utility functions for display to chromeos/display

chromeos/display/real_output_configurator_delegate.cc

 // Copyright (c) 2013 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/real_output_configurator_delegate.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/Xrandr.h>
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/message_pump_aurax11.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
+#include "chromeos/display/output_util.h"
 
 namespace chromeos {
 
 namespace {
 
 // DPI measurements.
 const float kMmInInch = 25.4;
 const float kDpi96 = 96.0;
 const float kPixelsToMmScale = kMmInInch / kDpi96;
 
 bool IsInternalOutput(const XRROutputInfo* output_info) {
-  return OutputConfigurator::IsInternalOutputName(
-      std::string(output_info->name));
+  return IsInternalOutputName(std::string(output_info->name));
 }
 
 RRMode GetOutputNativeMode(const XRROutputInfo* output_info) {
   return output_info->nmode > 0 ? output_info->modes[0] : None;
 }
 
 }  // namespace
 
 RealOutputConfiguratorDelegate::RealOutputConfiguratorDelegate()
     : display_(base::MessagePumpAuraX11::GetDefaultXDisplay()),
@@ skipping 71 matching lines @@
   RRCrtc last_used_crtc = None;
 
   for (int i = 0; i < screen_->noutput && outputs.size() < 2; ++i) {
     RROutput this_id = screen_->outputs[i];
     XRROutputInfo* output_info = XRRGetOutputInfo(display_, screen_, this_id);
     bool is_connected = (output_info->connection == RR_Connected);
 
     if (is_connected) {
       OutputConfigurator::OutputSnapshot to_populate;
       to_populate.output = this_id;
+      to_populate.has_display_id =
+          GetDisplayId(this_id, i, &to_populate.display_id);
       (outputs.empty() ? one_info : two_info) = output_info;
 
       // Now, look up the current CRTC and any related info.
       if (output_info->crtc) {
         XRRCrtcInfo* crtc_info = XRRGetCrtcInfo(
             display_, screen_, output_info->crtc);
         to_populate.current_mode = crtc_info->mode;
         to_populate.height = crtc_info->height;
         to_populate.y = crtc_info->y;
         XRRFreeCrtcInfo(crtc_info);
       }
 
       // Assign a CRTC that isn't already in use.
       for (int j = 0; j < output_info->ncrtc; ++j) {
         if (output_info->crtcs[j] != last_used_crtc) {
           to_populate.crtc = output_info->crtcs[j];
           last_used_crtc = to_populate.crtc;
           break;
         }
       }
 
       to_populate.native_mode = GetOutputNativeMode(output_info);
       to_populate.is_internal = IsInternalOutput(output_info);
       to_populate.is_aspect_preserving_scaling =
           IsOutputAspectPreservingScaling(this_id);
       to_populate.touch_device_id = None;
-      to_populate.index = i;
 
       VLOG(1) << "Found display #" << outputs.size()
               << " with output " << to_populate.output
               << " crtc " << to_populate.crtc
               << " current mode " << to_populate.current_mode;
       outputs.push_back(to_populate);
     } else {
       XRRFreeOutputInfo(output_info);
     }
   }
@@ skipping 401 matching lines @@
           << " id " << info[i].deviceid
           << " width " << width
           << " height " << height;
     }
   }
 
   XIFreeDeviceInfo(info);
 }
 
 }  // namespace chromeos