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

Unified Diff: services/view_manager/connection_manager.cc

Issue 893183003: De-client the ViewManager interfaces (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « services/view_manager/client_connection.cc ('k') | services/view_manager/connection_manager_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/view_manager/connection_manager.cc
diff --git a/services/view_manager/connection_manager.cc b/services/view_manager/connection_manager.cc
index 5c2097dd1ffecd0eaca7b3b8965ee7cb40cb19f5..d8388a441bfef4ab3d52f4a6a7a055051fbc6ede 100644
--- a/services/view_manager/connection_manager.cc
+++ b/services/view_manager/connection_manager.cc
@@ -171,12 +171,14 @@ void ConnectionManager::EmbedAtView(
if (it != connection_map_.end())
creator_url = it->second->service()->url();
+ mojo::ViewManagerServicePtr service_ptr;
ClientConnection* client_connection =
delegate_->CreateClientConnectionForEmbedAtView(
- this, creator_id, creator_url, url, view_id);
+ this, GetProxy(&service_ptr), creator_id, creator_url, url, view_id);
AddConnection(client_connection);
client_connection->service()->Init(client_connection->client(),
- services.Pass(), exposed_services.Pass());
+ service_ptr.Pass(), services.Pass(),
+ exposed_services.Pass());
OnConnectionMessagedClient(client_connection->service()->id());
}
@@ -218,7 +220,7 @@ void ConnectionManager::SetWindowManagerClientConnection(
window_manager_client_connection_ = connection.release();
AddConnection(window_manager_client_connection_);
window_manager_client_connection_->service()->Init(
- window_manager_client_connection_->client(), nullptr, nullptr);
+ window_manager_client_connection_->client(), nullptr, nullptr, nullptr);
}
bool ConnectionManager::CloneAndAnimate(const ViewId& view_id) {
« no previous file with comments | « services/view_manager/client_connection.cc ('k') | services/view_manager/connection_manager_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698