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

Unified Diff: content/renderer/render_view_impl.cc

Issue 1470823002: Enable builtin Mojo JS modules in layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@usb-testing
Patch Set: oops, clumsy Created 4 years, 11 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/renderer/render_frame_impl.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 84e6d1af9bb17da005014f5b438e4377adf6c9d2..cb1625f299254d01fc038d79ecbf8b95ef5542d0 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2361,7 +2361,13 @@ void RenderViewImpl::OnAllowBindings(int enabled_bindings_flags) {
new WebUIExtensionData(this);
if (main_render_frame_)
- main_render_frame_->EnableMojoBindings();
+ main_render_frame_->EnableMojoBindings(false /* for_layout_tests */);
+ }
+
+ if ((enabled_bindings_flags & BINDINGS_POLICY_MOJO) &&
+ !(enabled_bindings_ & BINDINGS_POLICY_MOJO) &&
+ main_render_frame_) {
+ main_render_frame_->EnableMojoBindings(true /* for_layout_tests */);
}
enabled_bindings_ |= enabled_bindings_flags;
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/shell/browser/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698