Changes how to compute the id of a display.

chromeos/display/output_util.h

Index: chromeos/display/output_util.h
diff --git a/chromeos/display/output_util.h b/chromeos/display/output_util.h
index 5ecda9bf055a6d6b6c1bf23c612a637739c37c26..0cbe159196a608b3243034d55789daf3ac6ecd83 100644
--- a/chromeos/display/output_util.h
+++ b/chromeos/display/output_util.h
@@ -16,12 +16,19 @@ typedef unsigned long XID;
 
 namespace chromeos {
 
-// Generates the display id for the pair of |output| and |index| and store
-// in |display_id_out|. Returns true if the display id is successfully
-// generated, or false otherwise.
+// Gets the EDID data from |output| and generates the display id through
+// |GetDisplayIdFromEDID|.
 CHROMEOS_EXPORT bool GetDisplayId(XID output, size_t index,
                                   int64* display_id_out);
 
+// Generates the display id for the pair of |prop| with |nitems| length and
+// |index|, and store in |display_id_out|. Returns true if the display id is
+// successfully generated, or false otherwise.
+CHROMEOS_EXPORT bool GetDisplayIdFromEDID(const unsigned char* prop,
+                                          unsigned long nitems,
+                                          size_t index,
+                                          int64* display_id_out);
+
 // Generates the human readable string from EDID obtained for |output|.
 CHROMEOS_EXPORT std::string GetDisplayName(XID output);
 
@@ -32,14 +39,13 @@ CHROMEOS_EXPORT std::string GetDisplayName(XID output);
 // false.
 CHROMEOS_EXPORT bool GetOutputOverscanFlag(XID output, bool* flag);
 
-// Parses |prop| as EDID data and stores extracted data into |manufacturer_id|,
-// |product_code|, and |human_readable_name| and returns true. NULL can be
+// Parses |prop| as EDID data and stores extracted data into |manufacturer_id|
+// and |human_readable_name| and returns true. NULL can be
 // passed for unwanted output parameters. This is exported for
 // x11_util_unittest.cc.
 CHROMEOS_EXPORT bool ParseOutputDeviceData(const unsigned char* prop,
                                            unsigned long nitems,
                                            uint16* manufacturer_id,
-                                           uint16* product_code,
                                            std::string* human_readable_name);
 
 // Parses |prop| as EDID data and stores the overscan flag to |flag|. Returns