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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2405093003: [WIP] Mojo native bindings interface.
Patch Set: fixes webui tests Created 3 years, 10 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/interface_provider_js_wrapper.cc ('k') | content/shell/BUILD.gn » ('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 4af9b671725620814b3f5d10384a881f4c68d83a..63214336039da679877daa1dc2ca9382fb8941ab 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -160,8 +160,6 @@
#include "media/blink/webmediaplayer_impl.h"
#include "media/media_features.h"
#include "media/renderers/gpu_video_accelerator_factories.h"
-#include "mojo/edk/js/core.h"
-#include "mojo/edk/js/support.h"
#include "net/base/data_url.h"
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
@@ -200,6 +198,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"
@@ -2604,17 +2603,12 @@ void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable(
v8::Isolate* isolate,
v8::Local<v8::Context> context) {
gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context);
- if (registry->available_modules().count(mojo::edk::js::Core::kModuleName))
+ if (registry->available_modules().count(gin::Console::kModuleName))
return;
v8::HandleScope handle_scope(isolate);
-
registry->AddBuiltinModule(isolate, gin::Console::kModuleName,
gin::Console::GetModule(isolate));
- registry->AddBuiltinModule(isolate, mojo::edk::js::Core::kModuleName,
- mojo::edk::js::Core::GetModule(isolate));
- registry->AddBuiltinModule(isolate, mojo::edk::js::Support::kModuleName,
- mojo::edk::js::Support::GetModule(isolate));
registry->AddBuiltinModule(
isolate, InterfaceProviderJsWrapper::kPerFrameModuleName,
InterfaceProviderJsWrapper::Create(
« no previous file with comments | « content/renderer/mojo/interface_provider_js_wrapper.cc ('k') | content/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698