Use persistent ID/names for displays.

ui/gfx/display.cc

Index: ui/gfx/display.cc
diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc
index 6a8bb85fcb75736dc08dfd844d2c2bd8eafa7a6a..1cf48143fba7fc562780445da7ceb272a3836625 100644
--- a/ui/gfx/display.cc
+++ b/ui/gfx/display.cc
@@ -32,6 +32,8 @@ float GetForcedDeviceScaleFactorImpl() {
 
 } // namespace
 
+const int64 Display::kInvalidID = -1;
+
 // static
 float Display::GetForcedDeviceScaleFactor() {
   static const float kForcedDeviceScaleFactor =
@@ -39,17 +41,24 @@ float Display::GetForcedDeviceScaleFactor() {
   return kForcedDeviceScaleFactor;
 }
 
+// static
+int64 Display::GetID(uint16 manufacturer_id, uint32 serial_number) {
+  int64 new_id = ((static_cast<int64>(manufacturer_id) << 32) | serial_number);
+  DCHECK_NE(kInvalidID, new_id);
+  return new_id;
+}
+
 Display::Display()
-    : id_(-1),
+    : id_(kInvalidID),
       device_scale_factor_(GetForcedDeviceScaleFactor()) {
 }
 
-Display::Display(int id)
+Display::Display(int64 id)
     : id_(id),
       device_scale_factor_(GetForcedDeviceScaleFactor()) {
 }
 
-Display::Display(int id, const gfx::Rect& bounds)
+Display::Display(int64 id, const gfx::Rect& bounds)
     : id_(id),
       bounds_(bounds),
       work_area_(bounds),
@@ -103,8 +112,8 @@ gfx::Size Display::GetSizeInPixel() const {
 }
 
 std::string Display::ToString() const {
-  return base::StringPrintf("Display[%d] bounds=%s, workarea=%s, scale=%f",
-                            id_,
+  return base::StringPrintf("Display[%lld] bounds=%s, workarea=%s, scale=%f",
+                            static_cast<long long int>(id_),
                             bounds_.ToString().c_str(),
                             work_area_.ToString().c_str(),
                             device_scale_factor_);