Ozone integration.

ui/display/types/display_snapshot.h

Index: ui/display/types/display_snapshot.h
diff --git a/ui/display/types/display_snapshot.h b/ui/display/types/display_snapshot.h
index 70192083cdfae99312c318d4c1a6008d0d37bae2..c59ecded646827b2c5d7e396bb723a72b4cf4d0b 100644
--- a/ui/display/types/display_snapshot.h
+++ b/ui/display/types/display_snapshot.h
@@ -20,7 +20,6 @@ namespace ui {
 class DISPLAY_TYPES_EXPORT DisplaySnapshot {
  public:
   DisplaySnapshot(int64_t display_id,
-                  bool has_proper_display_id,
                   const gfx::Point& origin,
                   const gfx::Size& physical_size,
                   DisplayConnectionType type,
@@ -42,10 +41,10 @@ class DISPLAY_TYPES_EXPORT DisplaySnapshot {
   std::string display_name() const { return display_name_; }
 
   int64_t display_id() const { return display_id_; }
-  bool has_proper_display_id() const { return has_proper_display_id_; }
 
   const DisplayMode* current_mode() const { return current_mode_; }
   const DisplayMode* native_mode() const { return native_mode_; }
+  int64_t product_id() const { return product_id_; }
 
   const std::vector<const DisplayMode*>& modes() const { return modes_; }
 
@@ -56,10 +55,12 @@ class DISPLAY_TYPES_EXPORT DisplaySnapshot {
   // Returns a textual representation of this display state.
   virtual std::string ToString() const = 0;
 
+  // Used when no product id known.
+  static const int64_t kInvalidProductID = -1;
+
  protected:
   // Display id for this output.
   int64_t display_id_;
-  bool has_proper_display_id_;
 
   // Display's origin on the framebuffer.
   gfx::Point origin_;
@@ -82,6 +83,9 @@ class DISPLAY_TYPES_EXPORT DisplaySnapshot {
   // "Best" mode supported by the output.
   const DisplayMode* native_mode_;
 
+  // Combination of manufacturer and product code.
+  int64_t product_id_;
+
   DISALLOW_COPY_AND_ASSIGN(DisplaySnapshot);
 };