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

Unified Diff: services/view_manager/connection_manager.cc

Issue 858103002: Remove [Client=] annotation from ServiceProvider (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: rebase for trybots (no code changes from ps2) 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
« no previous file with comments | « services/view_manager/connection_manager.h ('k') | services/view_manager/view_manager_service_apptest.cc » ('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 34c0d7c6a122fdf7c68eabad2d85b78fe324554d..fa6d1ed6ce1412c9ec0a159cbffba4b7c13417dd 100644
--- a/services/view_manager/connection_manager.cc
+++ b/services/view_manager/connection_manager.cc
@@ -164,7 +164,8 @@ void ConnectionManager::EmbedAtView(
ConnectionSpecificId creator_id,
const std::string& url,
const ViewId& view_id,
- mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) {
+ mojo::InterfaceRequest<mojo::ServiceProvider> services,
+ mojo::ServiceProviderPtr exposed_services) {
std::string creator_url;
ConnectionMap::const_iterator it = connection_map_.find(creator_id);
if (it != connection_map_.end())
@@ -175,7 +176,7 @@ void ConnectionManager::EmbedAtView(
this, creator_id, creator_url, url, view_id);
AddConnection(client_connection);
client_connection->service()->Init(client_connection->client(),
- service_provider.Pass());
+ services.Pass(), exposed_services.Pass());
OnConnectionMessagedClient(client_connection->service()->id());
}
@@ -216,10 +217,8 @@ void ConnectionManager::SetWindowManagerClientConnection(
CHECK(!window_manager_client_connection_);
window_manager_client_connection_ = connection.release();
AddConnection(window_manager_client_connection_);
- mojo::ServiceProviderPtr sp;
window_manager_client_connection_->service()->Init(
- window_manager_client_connection_->client(),
- GetProxy(&sp));
+ window_manager_client_connection_->client(), nullptr, nullptr);
}
bool ConnectionManager::CloneAndAnimate(const ViewId& view_id) {
« no previous file with comments | « services/view_manager/connection_manager.h ('k') | services/view_manager/view_manager_service_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698