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

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: self review 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
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 5a694e0704a5dad92775bad6b3d5b9d1cf28c748..42e9c7e249d50f4e7f123cf2ebdb7248c803e59d 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2534,6 +2534,14 @@ void RenderViewImpl::OnAllowBindings(int enabled_bindings_flags) {
!(enabled_bindings_ & BINDINGS_POLICY_WEB_UI)) {
// WebUIExtensionData deletes itself when we're destroyed.
new WebUIExtensionData(this);
+ }
+
+ // Enable Mojo bindings if either WebUI or Mojo bindings are being added to
+ // the policy and neither was previously present.
+ if (!(enabled_bindings_ & (BINDINGS_POLICY_WEB_UI | BINDINGS_POLICY_MOJO)) &&
+ (enabled_bindings_flags &
+ (BINDINGS_POLICY_WEB_UI | BINDINGS_POLICY_MOJO)) &&
+ GetMainRenderFrame()) {
// MojoBindingsController deletes itself when we're destroyed.
new MojoBindingsController(this);
}

Powered by Google App Engine
This is Rietveld 408576698