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

Unified Diff: content/browser/frame_host/frame_mojo_shell.cc

Issue 1311353005: Adds a way to determine id of content handler that created app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nuke comment Created 5 years, 4 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 | « content/browser/frame_host/frame_mojo_shell.h ('k') | content/browser/mojo/mojo_app_connection_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/frame_mojo_shell.cc
diff --git a/content/browser/frame_host/frame_mojo_shell.cc b/content/browser/frame_host/frame_mojo_shell.cc
index c2304032e3f323b43769670d5bd20b24b4da72e3..91a3875974174b6a2eabcd1b3eb69c78f7c5645e 100644
--- a/content/browser/frame_host/frame_mojo_shell.cc
+++ b/content/browser/frame_host/frame_mojo_shell.cc
@@ -32,7 +32,8 @@ void FrameMojoShell::ConnectToApplication(
mojo::URLRequestPtr application_url,
mojo::InterfaceRequest<mojo::ServiceProvider> services,
mojo::ServiceProviderPtr /* exposed_services */,
- mojo::CapabilityFilterPtr filter) {
+ mojo::CapabilityFilterPtr filter,
+ const ConnectToApplicationCallback& callback) {
mojo::ServiceProviderPtr frame_services;
service_provider_bindings_.AddBinding(GetServiceRegistry(),
GetProxy(&frame_services));
@@ -43,7 +44,7 @@ void FrameMojoShell::ConnectToApplication(
capability_filter = filter->filter.To<mojo::shell::CapabilityFilter>();
MojoShellContext::ConnectToApplication(
GURL(application_url->url), frame_host_->GetSiteInstance()->GetSiteURL(),
- services.Pass(), frame_services.Pass(), capability_filter);
+ services.Pass(), frame_services.Pass(), capability_filter, callback);
}
void FrameMojoShell::QuitApplication() {
« no previous file with comments | « content/browser/frame_host/frame_mojo_shell.h ('k') | content/browser/mojo/mojo_app_connection_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698