Start to decouple display::Display from ws::PlatformDisplay.

services/ui/display/screen_manager_delegate.h

Index: services/ui/display/screen_manager_delegate.h
diff --git a/services/ui/display/screen_manager_delegate.h b/services/ui/display/screen_manager_delegate.h
index c6ed387300309d04f8837e3093b50a1d49afd426..967dd478fcdc8c1bc9e31a6d0d1f364ee94cef92 100644
--- a/services/ui/display/screen_manager_delegate.h
+++ b/services/ui/display/screen_manager_delegate.h
@@ -9,25 +9,24 @@
 
 namespace display {
 
+class Display;
 struct ViewportMetrics;
 
 // The ScreenManagerDelegate will be informed of changes to the display or
 // screen state by ScreenManager.
 class ScreenManagerDelegate {
  public:
-  // Called when a display is added. |id| is the display id of the new display
-  // and |metrics| contains display viewport information.
-  virtual void OnDisplayAdded(int64_t id, const ViewportMetrics& metrics) = 0;
+  // Called when a display is added.
+  virtual void OnDisplayAdded(const display::Display& display,
+                              const ViewportMetrics& metrics) = 0;
 
-  // Called when a display is removed. |id| is the display id of the display
-  // that was removed.
-  virtual void OnDisplayRemoved(int64_t id) = 0;
-
-  // Called when a display is modified. |id| is the display id of the modified
-  // display and |metrics| contains updated display viewport information.
-  virtual void OnDisplayModified(int64_t id,
+  // Called when a display is modified.
+  virtual void OnDisplayModified(const display::Display& display,
                                  const ViewportMetrics& metrics) = 0;
 
+  // Called when a display is removed.
+  virtual void OnDisplayRemoved(int64_t display_id) = 0;
+
   // Called when the primary display is changed.
   virtual void OnPrimaryDisplayChanged(int64_t primary_display_id) = 0;