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

Unified Diff: mojo/shell/application_manager.cc

Issue 1318523007: Remove |requestor_url| from ApplicationManager::ConnectToApplication(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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: mojo/shell/application_manager.cc
diff --git a/mojo/shell/application_manager.cc b/mojo/shell/application_manager.cc
index cb834018770eb02fb0751af90ec00167d4357124..0ef4345b49d5e8bb23e9498f17a052cd6971c012 100644
--- a/mojo/shell/application_manager.cc
+++ b/mojo/shell/application_manager.cc
@@ -73,22 +73,20 @@ void ApplicationManager::TerminateShellConnections() {
void ApplicationManager::ConnectToApplication(
ApplicationInstance* originator,
- URLRequestPtr requested_url,
+ URLRequestPtr app_url_request,
const std::string& qualifier,
- const GURL& requestor_url,
InterfaceRequest<ServiceProvider> services,
ServiceProviderPtr exposed_services,
- const CapabilityFilter& capability_filter,
+ const CapabilityFilter& filter,
const base::Closure& on_application_end,
const Shell::ConnectToApplicationCallback& connect_callback) {
- DCHECK(requestor_url.is_empty());
scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams);
params->SetOriginatorInfo(originator);
- params->SetURLInfo(requested_url.Pass());
+ params->SetURLInfo(app_url_request.Pass());
params->set_qualifier(qualifier);
params->set_services(services.Pass());
params->set_exposed_services(exposed_services.Pass());
- params->set_filter(capability_filter);
+ params->set_filter(filter);
params->set_on_application_end(on_application_end);
params->set_connect_callback(connect_callback);

Powered by Google App Engine
This is Rietveld 408576698