Move chromeos specific utility functions for display to chromeos/display

ash/display/display_change_observer_x11.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 "ash/display/display_change_observer_x11.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
 #include <X11/extensions/Xrandr.h>
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/message_pump_aurax11.h"
+#include "chromeos/display/output_util.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
 
 // The DPI threshold to detect high density screen.
 // Higher DPI than this will use device_scale_factor=2.
@@ skipping 37 matching lines @@
     const unsigned long* size = kInvalidDisplaySizeList[i];
     if (output_info->mm_width == size[0] && output_info->mm_height == size[1]) {
       LOG(WARNING) << "Black listed display size detected:"
                    << size[0] << "x" << size[1];
       return true;
     }
   }
   return false;
 }
 
-std::string GetDisplayName(XID output_id) {
-  std::string display_name;
-  ui::GetOutputDeviceData(output_id, NULL, NULL, &display_name);
-  return display_name;
-}
-
-int64 GetDisplayId(XID output_id, int output_index) {
-  uint16 manufacturer_id = 0;
-  uint16 product_code = 0;
-  if (ui::GetOutputDeviceData(
-          output_id, &manufacturer_id, &product_code, NULL) &&
-      manufacturer_id != 0) {
-    // An ID based on display's index will be assigned later if this call
-    // fails.
-    return gfx::Display::GetID(manufacturer_id, product_code, output_index);
-  }
+int64 GetDisplayId(XID output, size_t output_index) {
+  int64 display_id;
+  if (chromeos::GetDisplayId(output, output_index, &display_id))
+    return display_id;
   return gfx::Display::kInvalidDisplayID;
 }
 
 }  // namespace
 
 DisplayChangeObserverX11::DisplayChangeObserverX11()
     : xdisplay_(base::MessagePumpAuraX11::GetDefaultXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       xrandr_event_base_(0) {
   int error_base_ignored;
   XRRQueryExtension(xdisplay_, &xrandr_event_base_, &error_base_ignored);
 
   // Find internal display.
   XRRScreenResources* screen_resources =
       XRRGetScreenResources(xdisplay_, x_root_window_);
   for (int output_index = 0; output_index < screen_resources->noutput;
        output_index++) {
     XID output = screen_resources->outputs[output_index];
     XRROutputInfo *output_info =
         XRRGetOutputInfo(xdisplay_, screen_resources, output);
-    bool is_internal = chromeos::OutputConfigurator::IsInternalOutputName(
+    bool is_internal = chromeos::IsInternalOutputName(
         std::string(output_info->name));
     XRRFreeOutputInfo(output_info);
     if (is_internal) {
       int64 id = GetDisplayId(output, output_index);
       // Fallback to output index. crbug.com/180100
       gfx::Display::SetInternalDisplayId(
           id == gfx::Display::kInvalidDisplayID ? output_index : id);
       break;
     }
   }
   XRRFreeScreenResources(screen_resources);
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 DisplayChangeObserverX11::~DisplayChangeObserverX11() {
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
-chromeos::OutputState DisplayChangeObserverX11::GetStateForOutputs(
-    const chromeos::OutputSnapshotList& outputs) const {
-  CHECK(outputs.size() == 2);
-  DisplayIdPair pair = std::make_pair(
-      GetDisplayId(outputs[0].output, outputs[0].index),
-      GetDisplayId(outputs[1].output, outputs[1].index));
+chromeos::OutputState DisplayChangeObserverX11::GetStateForDisplayIds(
+    const std::vector<int64>& display_ids) const {
+  CHECK_EQ(2U, display_ids.size());
+  DisplayIdPair pair = std::make_pair(display_ids[0], display_ids[1]);
   DisplayLayout layout = Shell::GetInstance()->display_controller()->
       GetRegisteredDisplayLayout(pair);
   return layout.mirrored ?
       chromeos::STATE_DUAL_MIRROR : chromeos::STATE_DUAL_EXTENDED;
 }
 
 void DisplayChangeObserverX11::OnDisplayModeChanged() {
   XRRScreenResources* screen_resources =
       XRRGetScreenResources(xdisplay_, x_root_window_);
   std::map<XID, XRRCrtcInfo*> crtc_info_map;
@@ skipping 31 matching lines @@
 
     float device_scale_factor = 1.0f;
     if (!ShouldIgnoreSize(output_info) &&
         (kInchInMm * mode->width / output_info->mm_width) >
         kHighDensityDPIThreshold) {
       device_scale_factor = 2.0f;
     }
     gfx::Rect display_bounds(
         crtc_info->x, crtc_info->y, mode->width, mode->height);
 
-    bool is_internal = chromeos::OutputConfigurator::IsInternalOutputName(
+    bool is_internal = chromeos::IsInternalOutputName(
         std::string(output_info->name));
     XRRFreeOutputInfo(output_info);
 
     std::string name = is_internal ?
         l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME) :
-        GetDisplayName(output);
+        chromeos::GetDisplayName(output);
     if (name.empty())
       name = l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
 
     bool has_overscan = false;
-    ui::GetOutputOverscanFlag(output, &has_overscan);
+    chromeos::GetOutputOverscanFlag(output, &has_overscan);
 
     int64 id = GetDisplayId(output, output_index);
 
     // If ID is invalid or there is an duplicate, just use output index.
     if (id == gfx::Display::kInvalidDisplayID || ids.find(id) != ids.end())
       id = output_index;
     ids.insert(id);
 
     displays.push_back(DisplayInfo(id, name, has_overscan));
     displays.back().set_device_scale_factor(device_scale_factor);
@@ skipping 15 matching lines @@
 void DisplayChangeObserverX11::OnAppTerminating() {
 #if defined(USE_ASH)
   // Stop handling display configuration events once the shutdown
   // process starts. crbug.com/177014.
   Shell::GetInstance()->output_configurator()->Stop();
 #endif
 }
 
 }  // namespace internal
 }  // namespace ash