Unify display ids between Display and PlatformDisplay.

services/ui/ws/display.h

Index: services/ui/ws/display.h
diff --git a/services/ui/ws/display.h b/services/ui/ws/display.h
index 25bd577103ab98ecf467f1be44ad56b4fb636f04..ab82996f10df76db2e6a36ebfdeb05c0f4f5120c 100644
--- a/services/ui/ws/display.h
+++ b/services/ui/ws/display.h
@@ -66,7 +66,7 @@ class Display : public PlatformDisplayDelegate,
   // Initializes state that depends on the existence of a Display.
   void Init(std::unique_ptr<DisplayBinding> binding);
 
-  uint32_t id() const { return id_; }
+  int64_t id() const { return platform_display_->GetId(); }

[msw, 2016/07/28 18:05:32]

nit: rename GetId, don't define here (optionally TODO now, follow up later)
(or move DefaultPlatformDisplay::id_ to PlatformDisplay and make the virtual
GetId into a simple accessor, if that's okay for TestPlatformDisplay)

[kylechar, 2016/07/28 18:49:22]

Right, tests. They'll need unique ids now too so I've made it
PlatformDisplay::id_ and a simple accessor.

 
   DisplayManager* display_manager();
   const DisplayManager* display_manager() const;
@@ -91,9 +91,6 @@ class Display : public PlatformDisplayDelegate,
   ::display::Display::Rotation GetRotation() const;
   gfx::Size GetSize() const;
 
-  // Returns the id for the corresponding id.
-  int64_t GetPlatformDisplayId() const;
-
   WindowServer* window_server() { return window_server_; }
 
   // Returns the root of the Display. The root's children are the roots
@@ -200,7 +197,6 @@ class Display : public PlatformDisplayDelegate,
   void OnWindowManagerWindowTreeFactoryReady(
       WindowManagerWindowTreeFactory* factory) override;
 
-  const uint32_t id_;
   std::unique_ptr<DisplayBinding> binding_;
   // Set once Init() has been called.
   bool init_called_ = false;