mus: Remove ViewportMetrics from mojom.

components/mus/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 "components/mus/ws/display.h"
 
 #include <set>
 #include <vector>
 
 #include "base/debug/debugger.h"
@@ skipping 73 matching lines @@
   display_ptr = mojom::Display::New();
   display_ptr->id = id_;
   display_ptr->bounds = mojo::Rect::New();
   // TODO(sky): Display should know it's origin.
   display_ptr->bounds->x = 0;
   display_ptr->bounds->y = 0;
   display_ptr->bounds->width = root_->bounds().size().width();
   display_ptr->bounds->height = root_->bounds().size().height();
   // TODO(sky): window manager needs an API to set the work area.
   display_ptr->work_area = display_ptr->bounds.Clone();
-  display_ptr->device_pixel_ratio =
-      platform_display_->GetViewportMetrics().device_pixel_ratio;
+  display_ptr->device_pixel_ratio = platform_display_->GetDeviceScaleFactor();
   display_ptr->rotation = platform_display_->GetRotation();
   // TODO(sky): make this real.
   display_ptr->is_primary = true;
   // TODO(sky): make this real.
   display_ptr->touch_support = mojom::TouchSupport::UNKNOWN;
   display_ptr->frame_decoration_values = mojom::FrameDecorationValues::New();
   display_ptr->frame_decoration_values->normal_client_area_insets =
       mojo::Insets::New();
   display_ptr->frame_decoration_values->maximized_client_area_insets =
       mojo::Insets::New();
@@ skipping 10 matching lines @@
   if (!platform_display_->IsFramePending()) {
     window->DestroySurfacesScheduledForDestruction();
     return;
   }
   if (windows_needing_frame_destruction_.count(window))
     return;
   windows_needing_frame_destruction_.insert(window);
   window->AddObserver(this);
 }
 
-const mojom::ViewportMetrics& Display::GetViewportMetrics() const {
-  return platform_display_->GetViewportMetrics();
-}
-
 ServerWindow* Display::GetRootWithId(const WindowId& id) {
   if (id == root_->id())
     return root_.get();
   for (auto& pair : window_manager_state_map_) {
     if (pair.second->root()->id() == id)
       return pair.second->root();
   }
   return nullptr;
 }
 
@@ skipping 145 matching lines @@
 void Display::OnNativeCaptureLost() {
   WindowManagerState* state = GetActiveWindowManagerState();
   if (state)
     state->SetCapture(nullptr, false);
 }
 
 void Display::OnDisplayClosed() {
   display_manager()->DestroyDisplay(this);
 }
 
-void Display::OnViewportMetricsChanged(
-    const mojom::ViewportMetrics& old_metrics,
-    const mojom::ViewportMetrics& new_metrics) {
+void Display::OnViewportMetricsChanged(const ViewportMetrics& old_metrics,
+                                       const ViewportMetrics& new_metrics) {
   if (!root_) {
     root_.reset(window_server_->CreateServerWindow(
         display_manager()->GetAndAdvanceNextRootId(),
         ServerWindow::Properties()));
-    root_->SetBounds(gfx::Rect(new_metrics.size_in_pixels.To<gfx::Size>()));
+    root_->SetBounds(gfx::Rect(new_metrics.size_in_pixels));
     root_->SetVisible(true);
     focus_controller_.reset(new FocusController(this, root_.get()));
     focus_controller_->AddObserver(this);
     InitWindowManagersIfNecessary();
   } else {
-    root_->SetBounds(gfx::Rect(new_metrics.size_in_pixels.To<gfx::Size>()));
+    root_->SetBounds(gfx::Rect(new_metrics.size_in_pixels));
     const gfx::Rect wm_bounds(root_->bounds().size());
     for (auto& pair : window_manager_state_map_)
       pair.second->root()->SetBounds(wm_bounds);
   }
   display_manager()->OnDisplayUpdate(this);
 }
 
 void Display::OnCompositorFrameDrawn() {
   std::set<ServerWindow*> windows;
   windows.swap(windows_needing_frame_destruction_);
@@ skipping 139 matching lines @@
   DCHECK_EQ(0u, window_manager_state_map_.count(id));
 }
 
 void Display::OnWindowManagerFactorySet(WindowManagerFactoryService* service) {
   if (!binding_)
     CreateWindowManagerStateFromService(service);
 }
 
 }  // namespace ws
 }  // namespace mus