Remove GetOutputNames from x11_util

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>
@@ skipping 67 matching lines @@
   }
   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);
+  }
+  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(
+        std::string(output_info->name));
+    XRRFreeOutputInfo(output_info);
+    if (is_internal) {
+      // No need to check the return value of |GetDisplayID()| as
+      // the default value is |gfx::Display::kInvalidDisplayID| anyway.
+      gfx::Display::SetInternalDisplayId(GetDisplayId(output, output_index));
+      break;
+    }
+  }
+  XRRFreeScreenResources(screen_resources);
 }
 
 DisplayChangeObserverX11::~DisplayChangeObserverX11() {
 }
 
 void DisplayChangeObserverX11::OnDisplayModeChanged() {
   XRRScreenResources* screen_resources =
       XRRGetScreenResources(xdisplay_, x_root_window_);
   std::map<XID, XRRCrtcInfo*> crtc_info_map;
 
@@ skipping 47 matching lines @@
 
     std::string name = is_internal ?
         l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME) :
         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);
 
-    uint16 manufacturer_id = 0;
-    uint16 product_code = 0;
-    int64 id = gfx::Display::kInvalidDisplayID;
+    int64 id = GetDisplayId(output, output_index);
 
-    if (ui::GetOutputDeviceData(
-            output, &manufacturer_id, &product_code, NULL) &&
-        manufacturer_id != 0) {
-      // An ID based on display's index will be assigned later if this call
-      // fails.
-      int64 new_id = gfx::Display::GetID(
-          manufacturer_id, product_code, output_index);
-      if (ids.find(new_id) == ids.end())
-        id = new_id;
-    }
-    if (id == gfx::Display::kInvalidDisplayID)
+    // 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);
     displays.back().SetBounds(display_bounds);
 
     y_coords.insert(crtc_info->y);
   }
 
   // Free all allocated resources.
   for (std::map<XID, XRRCrtcInfo*>::const_iterator iter = crtc_info_map.begin();
        iter != crtc_info_map.end(); ++iter) {
     XRRFreeCrtcInfo(iter->second);
   }
   XRRFreeScreenResources(screen_resources);
 
   // PowerManager lays out the outputs vertically. Sort them by Y
   // coordinates.
   std::sort(displays.begin(), displays.end(), CompareDisplayY);
 
   // DisplayManager can be null during the boot.
   Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
 }
 
 }  // namespace internal
 }  // namespace ash