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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1474563002: Make CapabilityFilter non-nullable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 1 month 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 | « no previous file | content/test/data/web_ui_mojo_shell_test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 8a8f31af59987977ada118fe7f3451f3a3fcc25c..9d97b856140cd6e823c41592eefe09d2c30389c2 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -5386,8 +5386,12 @@ mojo::ServiceProviderPtr RenderFrameImpl::ConnectToApplication(
mojo::ServiceProviderPtr service_provider;
mojo::URLRequestPtr request(mojo::URLRequest::New());
request->url = mojo::String::From(url);
+ mojo::CapabilityFilterPtr filter(mojo::CapabilityFilter::New());
+ mojo::Array<mojo::String> all_interfaces;
+ all_interfaces.push_back("*");
+ filter->filter.insert("*", all_interfaces.Pass());
mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
- nullptr, nullptr,
+ nullptr, filter.Pass(),
base::Bind(&OnGotContentHandlerID));
return service_provider.Pass();
}
« no previous file with comments | « no previous file | content/test/data/web_ui_mojo_shell_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698