Manual Merge 201756 "Changes how to compute the id of a display." (2nd)

ui/gfx/display.h

 // 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.
 
 #ifndef UI_GFX_DISPLAY_H_
 #define UI_GFX_DISPLAY_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/base/ui_export.h"
@@ skipping 23 matching lines @@
 
   // Returns the forced device scale factor, which is given by
   // "--force-device-scale-factor".
   static float GetForcedDeviceScaleFactor();
 
   // Indicates if a device scale factor is being explicitly enforced from the
   // command line via "--force-device-scale-factor".
   static bool HasForceDeviceScaleFactor();
 
   // Returns 64-bit persistent ID for the specified manufacturer's ID and
-  // product_code, and the index of the output it is connected to.
+  // product_code_hash, and the index of the output it is connected to.
   // |output_index| is used to distinguish the displays of the same type. For
   // example, swapping two identical display between two outputs will not be
   // treated as swap. The 'serial number' field in EDID isn't used here because
   // it is not guaranteed to have unique number and it may have the same fixed
   // value (like 0).
   static int64 GetID(uint16 manufacturer_id,
-                     uint16 product_code,
+                     uint32 product_code_hash,
                      uint8 output_index);
 
   // Sets/Gets unique identifier associated with the display.
   // -1 means invalid display and it doesn't not exit.
   int64 id() const { return id_; }
   void set_id(int64 id) { id_ = id; }
 
   // Gets/Sets the display's bounds in gfx::Screen's coordinates.
   const Rect& bounds() const { return bounds_; }
   void set_bounds(const Rect& bounds) { bounds_ = bounds; }
@@ skipping 56 matching lines @@
   int64 id_;
   Rect bounds_;
   Rect work_area_;
   float device_scale_factor_;
   Rotation rotation_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_DISPLAY_H_