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

Unified Diff: mojo/shell/application_instance.cc

Issue 1351963002: Some more minor cleanup to ApplicationManager. (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
« no previous file with comments | « mojo/shell/BUILD.gn ('k') | mojo/shell/application_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/application_instance.cc
diff --git a/mojo/shell/application_instance.cc b/mojo/shell/application_instance.cc
index 18aa4e05d4ffc2bc8b8a16b46b5a57f094615615..643cfa2289e849666cd5c89017cebaef149bd675 100644
--- a/mojo/shell/application_instance.cc
+++ b/mojo/shell/application_instance.cc
@@ -94,9 +94,16 @@ void ApplicationInstance::ConnectToApplication(
CapabilityFilter capability_filter = GetPermissiveCapabilityFilter();
if (!filter.is_null())
capability_filter = filter->filter.To<CapabilityFilter>();
- manager_->ConnectToApplication(
- this, app_request.Pass(), std::string(), services.Pass(),
- exposed_services.Pass(), capability_filter, base::Closure(), callback);
+
+ scoped_ptr<ConnectToApplicationParams> params(
+ new ConnectToApplicationParams);
+ params->SetOriginatorInfo(this);
+ params->SetURLInfo(app_request.Pass());
+ params->set_services(services.Pass());
+ params->set_exposed_services(exposed_services.Pass());
+ params->set_filter(capability_filter);
+ params->set_connect_callback(callback);
+ manager_->ConnectToApplication(params.Pass());
} else {
LOG(WARNING) << "CapabilityFilter prevented connection from: " <<
identity_.url << " to: " << url.spec();
« no previous file with comments | « mojo/shell/BUILD.gn ('k') | mojo/shell/application_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698