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

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

Issue 1244233002: Allow trusted brokers to restrict connections for spawned applications to whitelisted applications … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 5 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: 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 8196d5526e9ee84784d86bf31f9bf6445e9edae1..1cbf40b4b1354c35c1b84031a6ceaf5d6b015c0e 100644
--- a/content/browser/frame_host/frame_mojo_shell.cc
+++ b/content/browser/frame_host/frame_mojo_shell.cc
@@ -31,14 +31,15 @@ void FrameMojoShell::BindRequest(
void FrameMojoShell::ConnectToApplication(
mojo::URLRequestPtr application_url,
mojo::InterfaceRequest<mojo::ServiceProvider> services,
- mojo::ServiceProviderPtr /* exposed_services */) {
+ mojo::ServiceProviderPtr /* exposed_services */,
+ mojo::CapabilityFilterPtr filter) {
mojo::ServiceProviderPtr frame_services;
service_provider_bindings_.AddBinding(GetServiceRegistry(),
GetProxy(&frame_services));
MojoShellContext::ConnectToApplication(
GURL(application_url->url), frame_host_->GetSiteInstance()->GetSiteURL(),
- services.Pass(), frame_services.Pass());
+ services.Pass(), frame_services.Pass(), filter.Pass());
}
void FrameMojoShell::QuitApplication() {

Powered by Google App Engine
This is Rietveld 408576698