Unify display ids between Display and PlatformDisplay.

services/ui/ws/platform_display.cc

 // Copyright 2014 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/platform_display.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "build/build_config.h"
 #include "cc/ipc/quads.mojom.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 36 matching lines @@
 PlatformDisplay* PlatformDisplay::Create(
     const PlatformDisplayInitParams& init_params) {
   if (factory_)
     return factory_->CreatePlatformDisplay();
 
   return new DefaultPlatformDisplay(init_params);
 }
 
 DefaultPlatformDisplay::DefaultPlatformDisplay(
     const PlatformDisplayInitParams& init_params)
-    : display_id_(init_params.display_id),
+    : id_(init_params.display_id),
 #if !defined(OS_ANDROID)
       cursor_loader_(ui::CursorLoader::Create()),
 #endif
-      frame_generator_(new FrameGenerator(this,
-                                          init_params.surfaces_state)) {
+      frame_generator_(new FrameGenerator(this, init_params.surfaces_state)) {
   metrics_.bounds = init_params.display_bounds;
   // TODO(rjkroege): Preserve the display_id when Ozone platform can use it.
 }
 
 void DefaultPlatformDisplay::Init(PlatformDisplayDelegate* delegate) {
   delegate_ = delegate;
 
 #if defined(OS_WIN)
   platform_window_.reset(new ui::WinWindow(this, metrics_.bounds));
 #elif defined(USE_X11)
   platform_window_.reset(new ui::X11Window(this));
 #elif defined(OS_ANDROID)
   platform_window_.reset(new ui::PlatformWindowAndroid(this));
 #elif defined(USE_OZONE)
   platform_window_ = ui::OzonePlatform::GetInstance()->CreatePlatformWindow(
       this, metrics_.bounds);
 #else
   NOTREACHED() << "Unsupported platform";
 #endif
   platform_window_->SetBounds(metrics_.bounds);
   platform_window_->Show();
 }
 
+int64_t DefaultPlatformDisplay::GetId() const {
+  return id_;
+}
+
 DefaultPlatformDisplay::~DefaultPlatformDisplay() {
   // Don't notify the delegate from the destructor.
   delegate_ = nullptr;
 
   frame_generator_.reset();
   // Destroy the PlatformWindow early on as it may call us back during
   // destruction and we want to be in a known state. But destroy the surface
   // first because it can still be using the platform window.
   platform_window_.reset();
 }
@@ skipping 58 matching lines @@
 void DefaultPlatformDisplay::SetImeVisibility(bool visible) {
   ui::PlatformImeController* ime = platform_window_->GetPlatformImeController();
   if (ime)
     ime->SetImeVisibility(visible);
 }
 
 bool DefaultPlatformDisplay::IsFramePending() const {
   return frame_generator_->is_frame_pending();
 }
 
-int64_t DefaultPlatformDisplay::GetDisplayId() const {
-  return display_id_;
-}
-
 gfx::Rect DefaultPlatformDisplay::GetBounds() const {
   return metrics_.bounds;
 }
 
 void DefaultPlatformDisplay::UpdateMetrics(const gfx::Rect& bounds,
                                            float device_scale_factor) {
   if (display::Display::HasForceDeviceScaleFactor())
     device_scale_factor = display::Display::GetForcedDeviceScaleFactor();
   if (metrics_.bounds == bounds &&
       metrics_.device_scale_factor == device_scale_factor)
@@ skipping 100 matching lines @@
   return delegate_ ? delegate_->IsInHighContrastMode() : false;
 }
 
 const ViewportMetrics& DefaultPlatformDisplay::GetViewportMetrics() {
   return metrics_;
 }
 
 }  // namespace ws
 
 }  // namespace ui