Remove NativeViewportClient

services/view_manager/display_manager.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/view_manager/display_manager.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
@@ skipping 73 matching lines @@
       weak_factory_(this) {
   metrics_.size = mojo::Size::New();
   metrics_.size->width = 800;
   metrics_.size->height = 600;
 }
 
 void DefaultDisplayManager::Init(ConnectionManager* connection_manager) {
   connection_manager_ = connection_manager;
   app_connection_->ConnectToService("mojo:native_viewport_service",
                                     &native_viewport_);
-  native_viewport_.set_client(this);
+  native_viewport_.set_error_handler(this);
   native_viewport_->Create(
       metrics_.size->Clone(),
       base::Bind(&DefaultDisplayManager::OnCreatedNativeViewport,
                  weak_factory_.GetWeakPtr()));
   native_viewport_->Show();
 
   app_connection_->ConnectToService("mojo:surfaces_service", &surface_);
   surface_.set_client(this);
 
   mojo::NativeViewportEventDispatcherPtr event_dispatcher;
@@ skipping 22 matching lines @@
 
 void DefaultDisplayManager::SetViewportSize(const gfx::Size& size) {
   native_viewport_->SetSize(Size::From(size));
 }
 
 const mojo::ViewportMetrics& DefaultDisplayManager::GetViewportMetrics() {
   return metrics_;
 }
 
 void DefaultDisplayManager::OnCreatedNativeViewport(
-    uint64_t native_viewport_id) {
+    uint64_t native_viewport_id,
+    mojo::ViewportMetricsPtr metrics) {
+  OnMetricsChanged(metrics.Pass());
 }
 
 void DefaultDisplayManager::Draw() {
   if (!surface_allocated_) {
     surface_->CreateSurface(kLocalSurfaceID);
     surface_allocated_ = true;
   }
 
   Rect rect;
   rect.width = metrics_.size->width;
@@ skipping 11 matching lines @@
 
   if (id_namespace_ == 0u)
     return;
 
   auto qualified_id = mojo::SurfaceId::New();
   qualified_id->id_namespace = id_namespace_;
   qualified_id->local = kLocalSurfaceID;
   native_viewport_->SubmittedFrame(qualified_id.Pass());
 }
 
-void DefaultDisplayManager::OnDestroyed() {
-  // This is called when the native_viewport is torn down before
-  // ~DefaultDisplayManager may be called.
-  native_viewport_closed_callback_.Run();
-}
-
 void DefaultDisplayManager::OnMetricsChanged(mojo::ViewportMetricsPtr metrics) {
-  metrics_.size = metrics->size.Pass();
+  metrics_.size = metrics->size.Clone();
   metrics_.device_pixel_ratio = metrics->device_pixel_ratio;
   gfx::Rect bounds(metrics_.size.To<gfx::Size>());
   connection_manager_->root()->SetBounds(bounds);
   if (!surface_allocated_)
     return;
   surface_->DestroySurface(kLocalSurfaceID);
   surface_allocated_ = false;
   SchedulePaint(connection_manager_->root(), bounds);
+  native_viewport_->RequestMetrics(base::Bind(
+      &DefaultDisplayManager::OnMetricsChanged, weak_factory_.GetWeakPtr()));
 }
 
 void DefaultDisplayManager::SetIdNamespace(uint32_t id_namespace) {
   id_namespace_ = id_namespace;
   if (surface_allocated_) {
     auto qualified_id = mojo::SurfaceId::New();
     qualified_id->id_namespace = id_namespace_;
     qualified_id->local = kLocalSurfaceID;
     native_viewport_->SubmittedFrame(qualified_id.Pass());
   }
 }
 
 void DefaultDisplayManager::ReturnResources(
     mojo::Array<mojo::ReturnedResourcePtr> resources) {
   DCHECK_EQ(0u, resources.size());
 }
 
+void DefaultDisplayManager::OnConnectionError() {
+  // This is called when the native_viewport is torn down before
+  // ~DefaultDisplayManager may be called.
+  native_viewport_closed_callback_.Run();
+}
+
 }  // namespace view_manager