Use persistent ID/names for displays.

ui/aura/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 "ui/aura/display_change_observer_x11.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
 #include <X11/extensions/Xrandr.h>
 
 #include "base/message_pump_aurax11.h"
 #include "ui/aura/dispatcher_linux.h"
 #include "ui/aura/env.h"
 #include "ui/aura/display_manager.h"
+#include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 
 namespace aura {
 namespace internal {
 
 namespace {
 
 // The DPI threshold to detect high density screen.
 // Higher DPI than this will use device_scale_factor=2.
@@ skipping 82 matching lines @@
 
   for (int c = 0; c < screen_resources->ncrtc; c++) {
     XID crtc_id = screen_resources->crtcs[c];
     XRRCrtcInfo *crtc_info =
         XRRGetCrtcInfo(xdisplay_, screen_resources, crtc_id);
     crtc_info_map[crtc_id] = crtc_info;
   }
 
   std::vector<gfx::Display> displays;
   std::set<int> y_coords;
+  std::set<int64> ids;
   for (int o = 0; o < screen_resources->noutput; o++) {
     XRROutputInfo *output_info =
         XRRGetOutputInfo(xdisplay_,
                          screen_resources,
                          screen_resources->outputs[o]);
     if (output_info->connection != RR_Connected) {
       XRRFreeOutputInfo(output_info);
       continue;
     }
     XRRCrtcInfo* crtc_info = crtc_info_map[output_info->crtc];
@@ skipping 13 matching lines @@
     displays.push_back(gfx::Display(
         0,
         gfx::Rect(crtc_info->x, crtc_info->y, mode->width, mode->height)));
 
     float device_scale_factor = 1.0f;
     if (!ShouldIgnoreSize(output_info) &&
         (kInchInMm * mode->width / output_info->mm_width) >
         kHighDensityDIPThreshold) {
       device_scale_factor = 2.0f;
     }
+
+    uint16 manufacturer_id = 0;
+    uint32 serial_number = 0;
+    if (ui::GetOutputDeviceData(screen_resources->outputs[o], &manufacturer_id,
+                                &serial_number, 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, serial_number);
+      if (ids.find(new_id) == ids.end()) {
+        displays.back().set_id(new_id);
+        ids.insert(new_id);
+      }
+    }
+
     displays.back().set_device_scale_factor(device_scale_factor);
     y_coords.insert(crtc_info->y);
     XRRFreeOutputInfo(output_info);
   }
 
   // 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);
-  // TODO(oshima): Assisgn index as ID for now. Use unique ID.
   int id = 0;
   for (std::vector<gfx::Display>::iterator iter = displays.begin();
-       iter != displays.end(); ++iter, ++id)
-    (*iter).set_id(id);
+       iter != displays.end(); ++iter) {
+    if (iter->id() == gfx::Display::kInvalidID) {
+      iter->set_id(id);
+      ++id;
+    }
+  }
 
   Env::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
 }
 
 }  // namespace internal
 }  // namespace aura