Reland linux_aura: Implement most of DesktopScreenX11.

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 d2f1f01c4056bdf98dcd9194900b2349c94dc62e..3c7a49fc0f8f72c9aa0b00ee551c473c7a18e3fa 100644
--- a/chromeos/display/output_util.h
+++ b/chromeos/display/output_util.h
@@ -23,19 +23,6 @@ typedef _XRROutputInfo XRROutputInfo;
 
 namespace chromeos {
 
-// 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);
 
@@ -46,15 +33,6 @@ 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|
-// and |human_readable_name| and returns true. NULL can be passed for unwanted
-// output parameters. Some devices (especially internal displays) may not have
-// the field for |human_readable_name|, and it will return true in that case.
-CHROMEOS_EXPORT bool ParseOutputDeviceData(const unsigned char* prop,
-                                           unsigned long nitems,
-                                           uint16* manufacturer_id,
-                                           std::string* human_readable_name);
-
 // Parses |prop| as EDID data and stores the overscan flag to |flag|. Returns
 // true if the flag is found. This is exported for x11_util_unittest.cc.
 CHROMEOS_EXPORT bool ParseOutputOverscanFlag(const unsigned char* prop,