Unify display ids between Display and PlatformDisplay.

services/ui/ws/display.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/ws/display.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 15 matching lines @@
 #include "services/ui/ws/window_server_delegate.h"
 #include "services/ui/ws/window_tree.h"
 #include "services/ui/ws/window_tree_binding.h"
 #include "ui/base/cursor/cursor.h"
 
 namespace ui {
 namespace ws {
 
 Display::Display(WindowServer* window_server,
                  const PlatformDisplayInitParams& platform_display_init_params)
-    : id_(window_server->display_manager()->GetAndAdvanceNextDisplayId()),
-      window_server_(window_server),
+    : window_server_(window_server),
       platform_display_(PlatformDisplay::Create(platform_display_init_params)),
       last_cursor_(ui::kCursorNone) {
   platform_display_->Init(this);
 
   window_server_->window_manager_window_tree_factory_set()->AddObserver(this);
   window_server_->user_id_tracker()->AddObserver(this);
 }
 
 Display::~Display() {
   window_server_->user_id_tracker()->RemoveObserver(this);
@@ skipping 18 matching lines @@
   }
 }
 
 void Display::Init(std::unique_ptr<DisplayBinding> binding) {
   init_called_ = true;
   binding_ = std::move(binding);
   display_manager()->AddDisplay(this);
   InitWindowManagerDisplayRootsIfNecessary();
 }
 
+int64_t Display::GetId() const {

[msw, 2016/07/28 19:01:02]

optional nit: this seems like it'd be okay as a simple accessor.
(you may change this to |id()| and define in the header if desired)
(though, the |display_manager()| simple accessors are defined here)

[kylechar, 2016/07/28 19:20:16]

I'll probably leave it like this, it better conveys the ownership (and I won't
have to change anything it again if I end making PlatformDisplay pure virtual
again).

+  return platform_display_->id();
+}
+
 DisplayManager* Display::display_manager() {
   return window_server_->display_manager();
 }
 
 const DisplayManager* Display::display_manager() const {
   return window_server_->display_manager();
 }
 
 mojom::WsDisplayPtr Display::ToWsDisplay() const {
   mojom::WsDisplayPtr display_ptr = mojom::WsDisplay::New();
 
   display_ptr->display = ToDisplay();
 
   // TODO(sky): make this real.
   display_ptr->is_primary = true;
   // TODO(sky): make this real.
   display_ptr->frame_decoration_values = mojom::FrameDecorationValues::New();
   return display_ptr;
 }
 
 ::display::Display Display::ToDisplay() const {
-  ::display::Display display(id_);
+  ::display::Display display(GetId());
 
   // TODO(sky): Display should know its origin.
   display.set_bounds(gfx::Rect(0, 0, root_->bounds().size().width(),
                                root_->bounds().size().height()));
   // TODO(sky): window manager needs an API to set the work area.
   display.set_work_area(display.bounds());
   display.set_device_scale_factor(platform_display_->GetDeviceScaleFactor());
   display.set_rotation(platform_display_->GetRotation());
   display.set_touch_support(
       ::display::Display::TouchSupport::TOUCH_SUPPORT_UNKNOWN);
@@ skipping 19 matching lines @@
 }
 
 ::display::Display::Rotation Display::GetRotation() const {
   return platform_display_->GetRotation();
 }
 
 gfx::Size Display::GetSize() const {
   return root_->bounds().size();
 }
 
-int64_t Display::GetPlatformDisplayId() const {
-  return platform_display_->GetDisplayId();
-}
-
 ServerWindow* Display::GetRootWithId(const WindowId& id) {
   if (id == root_->id())
     return root_.get();
   for (auto& pair : window_manager_display_root_map_) {
     if (pair.second->root()->id() == id)
       return pair.second->root();
   }
   return nullptr;
 }
 
@@ skipping 273 matching lines @@
 }
 
 void Display::OnWindowManagerWindowTreeFactoryReady(
     WindowManagerWindowTreeFactory* factory) {
   if (!binding_)
     CreateWindowManagerDisplayRootFromFactory(factory);
 }
 
 }  // namespace ws
 }  // namespace ui