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

services/ui/display/screen_manager_ozone_internal.cc

 // Copyright 2016 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/display/screen_manager_ozone_internal.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 290 matching lines @@
 void ScreenManagerOzoneInternal::RelinquishDisplayControl(
     const RelinquishDisplayControlCallback& callback) {
   display_configurator_.RelinquishControl(callback);
 }
 
 void ScreenManagerOzoneInternal::OnDisplayAdded(const Display& display) {
   ViewportMetrics metrics = GetViewportMetricsForDisplay(display);
   DVLOG(1) << "OnDisplayAdded: " << display.ToString() << "\n  "
            << metrics.ToString();
   screen_->display_list().AddDisplay(display, DisplayList::Type::NOT_PRIMARY);
-  delegate_->OnDisplayAdded(display.id(), metrics);
+  delegate_->OnDisplayAdded(display, metrics);
 }
 
 void ScreenManagerOzoneInternal::OnDisplayRemoved(const Display& display) {
   // TODO(kylechar): If we're removing the primary display we need to first set
   // a new primary display. This will crash until then.
 
   DVLOG(1) << "OnDisplayRemoved: " << display.ToString();
   screen_->display_list().RemoveDisplay(display.id());
   delegate_->OnDisplayRemoved(display.id());
 }
 
 void ScreenManagerOzoneInternal::OnDisplayMetricsChanged(
     const Display& display,
     uint32_t changed_metrics) {
   ViewportMetrics metrics = GetViewportMetricsForDisplay(display);
   DVLOG(1) << "OnDisplayModified: " << display.ToString() << "\n  "
            << metrics.ToString();
   screen_->display_list().UpdateDisplay(display);
-  delegate_->OnDisplayModified(display.id(), metrics);
+  delegate_->OnDisplayModified(display, metrics);
 }
 
 ViewportMetrics ScreenManagerOzoneInternal::GetViewportMetricsForDisplay(
     const Display& display) {
   const ManagedDisplayInfo& managed_info =
       display_manager_->GetDisplayInfo(display.id());
 
   ViewportMetrics metrics;
-  metrics.bounds = display.bounds();
-  metrics.work_area = display.work_area();
-  metrics.pixel_size = managed_info.bounds_in_native().size();
-  metrics.rotation = display.rotation();
-  metrics.touch_support = display.touch_support();
+  // TODO(kylechar): The origin of |metrics.bounds_in_pixels| should be updated
+  // so that PlatformWindows appear next to one another for multiple displays.
+  metrics.bounds_in_pixels = managed_info.bounds_in_native();
   metrics.device_scale_factor = display.device_scale_factor();
   metrics.ui_scale_factor = managed_info.configured_ui_scale();
 
   return metrics;
 }
 
 void ScreenManagerOzoneInternal::CreateOrUpdateMirroringDisplay(
     const DisplayInfoList& display_info_list) {
   NOTIMPLEMENTED();
 }
@@ skipping 45 matching lines @@
       std::move(request));
 }
 
 void ScreenManagerOzoneInternal::Create(
     const service_manager::Identity& remote_identity,
     mojom::TestDisplayControllerRequest request) {
   test_bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace display