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

Unified Diff: content/renderer/mojo_bindings_controller.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/mojo_bindings_controller.h ('k') | content/renderer/mojo_context_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/mojo_bindings_controller.cc
diff --git a/content/renderer/mojo_bindings_controller.cc b/content/renderer/mojo_bindings_controller.cc
index 08abcf574f20ac285cf03040c3ca20efaf985ebe..b3b9f0757f254d2911349e8cd9c2fb42f66cf2f9 100644
--- a/content/renderer/mojo_bindings_controller.cc
+++ b/content/renderer/mojo_bindings_controller.cc
@@ -26,9 +26,11 @@ struct MojoContextStateData : public base::SupportsUserData::Data {
} // namespace
-MojoBindingsController::MojoBindingsController(RenderFrame* render_frame)
+MojoBindingsController::MojoBindingsController(RenderFrame* render_frame,
+ bool for_layout_tests)
: RenderFrameObserver(render_frame),
- RenderFrameObserverTracker<MojoBindingsController>(render_frame) {}
+ RenderFrameObserverTracker<MojoBindingsController>(render_frame),
+ for_layout_tests_(for_layout_tests) {}
MojoBindingsController::~MojoBindingsController() {
}
@@ -40,7 +42,7 @@ void MojoBindingsController::CreateContextState() {
v8::Local<v8::Context> context = frame->mainWorldScriptContext();
gin::PerContextData* context_data = gin::PerContextData::From(context);
MojoContextStateData* data = new MojoContextStateData;
- data->state.reset(new MojoContextState(frame, context));
+ data->state.reset(new MojoContextState(frame, context, for_layout_tests_));
context_data->SetUserData(kMojoContextStateKey, data);
}
« no previous file with comments | « content/renderer/mojo_bindings_controller.h ('k') | content/renderer/mojo_context_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698