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 115 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.
+      displays.back().set_id(
+          gfx::Display::GetID(manufacturer_id, serial_number));

[Daniel Erat, 2012/08/17 14:33:46]

Maybe I'm being overly paranoid here, but I wonder if it's worthwhile to also
keep a set to make sure that we don't try to use the same ID twice.  It's not
impossible for me to imagine a manufacturer being lazy and shipping monitors
that all report the same serial number...

[Jun Mukai, 2012/08/20 05:56:38]

Hmm, I see.  Added a check code so that index-based ID will be used in that
case.

+    }
+
     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