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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2400563002: Adds Mojo IDL. (Closed)
Patch Set: fixes modulename typo Created 4 years, 2 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 | « no previous file | third_party/WebKit/Source/DEPS » ('j') | third_party/WebKit/Source/core/mojo/Mojo.idl » ('J')
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 ab4fd84d9ac2460bfd6fbccd0834096b4eed778c..e6b88a077366817c428bb46ac97776b03506b7bb 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -184,6 +184,7 @@
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
+#include "third_party/WebKit/public/web/WebMojoBindings.h"
#include "third_party/WebKit/public/web/WebNavigationPolicy.h"
#include "third_party/WebKit/public/web/WebPlugin.h"
#include "third_party/WebKit/public/web/WebPluginContainer.h"
@@ -2551,20 +2552,22 @@ void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable(
return;
v8::HandleScope handle_scope(isolate);
- registry->AddBuiltinModule(isolate, mojo::edk::js::Core::kModuleName,
- mojo::edk::js::Core::GetModule(isolate));
+ registry->AddBuiltinModule(
Ken Rockot(use gerrit already) 2016/10/10 17:11:25 I don't think this code should change yet. We shou
alokp 2016/10/18 00:11:47 Agreed. I have reverted the changes in this file f
+ isolate, mojo::edk::js::Core::kModuleName,
+ blink::WebMojoBindings::createCore(isolate, context));
registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName,
mojo::edk::js::Support::GetModule(isolate));
registry->AddBuiltinModule(
isolate, InterfaceProviderJsWrapper::kPerFrameModuleName,
- InterfaceProviderJsWrapper::Create(
- isolate, context, remote_interfaces_.get())
- .ToV8());
+ blink::WebMojoBindings::createInterfaceProvider(
+ isolate, context, base::MakeUnique<BlinkInterfaceProviderImpl>(
+ remote_interfaces_->GetWeakPtr())));
registry->AddBuiltinModule(
isolate, InterfaceProviderJsWrapper::kPerProcessModuleName,
- InterfaceProviderJsWrapper::Create(
- isolate, context, RenderThread::Get()->GetRemoteInterfaces())
- .ToV8());
+ blink::WebMojoBindings::createInterfaceProvider(
+ isolate, context,
+ base::MakeUnique<BlinkInterfaceProviderImpl>(
+ RenderThread::Get()->GetRemoteInterfaces()->GetWeakPtr())));
}
void RenderFrameImpl::AddMessageToConsole(ConsoleMessageLevel level,
« no previous file with comments | « no previous file | third_party/WebKit/Source/DEPS » ('j') | third_party/WebKit/Source/core/mojo/Mojo.idl » ('J')

Powered by Google App Engine
This is Rietveld 408576698