De-Client Surface interface

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 81 matching lines @@
   app_connection_->ConnectToService("mojo:native_viewport_service",
                                     &native_viewport_);
   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);
+  surface_->GetIdNamespace(base::Bind(&DefaultDisplayManager::SetIdNamespace,
+                                      base::Unretained(this)));
 
   mojo::NativeViewportEventDispatcherPtr event_dispatcher;
   app_connection_->ConnectToService(&event_dispatcher);
   native_viewport_->SetEventDispatcher(event_dispatcher.Pass());
 }
 
 DefaultDisplayManager::~DefaultDisplayManager() {
 }
 
 void DefaultDisplayManager::SchedulePaint(const ServerView* view,
@@ skipping 73 matching lines @@
 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