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

Unified Diff: components/view_manager/view_manager_app.cc

Issue 1166123005: Removes ServiceProviders from ViewManager::Embed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use is_headless rather than check for browser. Created 5 years, 6 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 | « components/view_manager/view_manager_app.h ('k') | components/view_manager/view_manager_client_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/view_manager/view_manager_app.cc
diff --git a/components/view_manager/view_manager_app.cc b/components/view_manager/view_manager_app.cc
index 0dac932b22b65e158e8bd410d3756f22cd6776af..fca94bfeb53b9ab10c088e08cb05d6ab3745aff1 100644
--- a/components/view_manager/view_manager_app.cc
+++ b/components/view_manager/view_manager_app.cc
@@ -81,15 +81,13 @@ ClientConnection* ViewManagerApp::CreateClientConnectionForEmbedAtView(
ConnectionManager* connection_manager,
mojo::InterfaceRequest<mojo::ViewManagerService> service_request,
mojo::ConnectionSpecificId creator_id,
- const std::string& creator_url,
mojo::URLRequestPtr request,
const ViewId& root_id) {
mojo::ViewManagerClientPtr client;
- std::string url = request->url.To<std::string>();
app_impl_->ConnectToService(request.Pass(), &client);
- scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
- connection_manager, creator_id, creator_url, url, root_id));
+ scoped_ptr<ViewManagerServiceImpl> service(
+ new ViewManagerServiceImpl(connection_manager, creator_id, root_id));
return new DefaultClientConnection(service.Pass(), connection_manager,
service_request.Pass(), client.Pass());
}
@@ -98,11 +96,10 @@ ClientConnection* ViewManagerApp::CreateClientConnectionForEmbedAtView(
ConnectionManager* connection_manager,
mojo::InterfaceRequest<mojo::ViewManagerService> service_request,
mojo::ConnectionSpecificId creator_id,
- const std::string& creator_url,
const ViewId& root_id,
mojo::ViewManagerClientPtr view_manager_client) {
- scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
- connection_manager, creator_id, creator_url, std::string(), root_id));
+ scoped_ptr<ViewManagerServiceImpl> service(
+ new ViewManagerServiceImpl(connection_manager, creator_id, root_id));
return new DefaultClientConnection(service.Pass(), connection_manager,
service_request.Pass(),
view_manager_client.Pass());
@@ -116,8 +113,7 @@ void ViewManagerApp::Create(ApplicationConnection* connection,
}
scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
- connection_manager_.get(), kInvalidConnectionId, std::string(),
- connection->GetRemoteApplicationURL(), RootViewId()));
+ connection_manager_.get(), kInvalidConnectionId, RootViewId()));
mojo::ViewManagerClientPtr client;
connection->ConnectToService(&client);
scoped_ptr<ClientConnection> client_connection(
« no previous file with comments | « components/view_manager/view_manager_app.h ('k') | components/view_manager/view_manager_client_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698