Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(633)

Unified Diff: services/view_manager/display_manager.cc

Issue 871373015: De-Client Surface interface (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: services/view_manager/display_manager.cc
diff --git a/services/view_manager/display_manager.cc b/services/view_manager/display_manager.cc
index 207ab8ce24e39615277ded0a0eee06175f0c5bdc..674c0facb9b9b5d0b9cc0d664ab948b458a535fc 100644
--- a/services/view_manager/display_manager.cc
+++ b/services/view_manager/display_manager.cc
@@ -99,7 +99,8 @@ void DefaultDisplayManager::Init(ConnectionManager* connection_manager) {
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);
@@ -193,11 +194,6 @@ void DefaultDisplayManager::SetIdNamespace(uint32_t id_namespace) {
}
}
-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.

Powered by Google App Engine
This is Rietveld 408576698