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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 88306cca067ef5752d2960031f3c0e7e719509e9..8b637bfe2dc51dcdcfb6032e3fe524bfae0a2b32 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -140,6 +140,8 @@
#include "media/blink/webmediaplayer_impl.h"
#include "media/renderers/gpu_video_accelerator_factories.h"
#include "mojo/common/url_type_converters.h"
+#include "mojo/edk/js/core.h"
+#include "mojo/edk/js/support.h"
#include "net/base/data_url.h"
#include "net/base/net_errors.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
@@ -173,8 +175,6 @@
#include "third_party/WebKit/public/web/WebSurroundingText.h"
#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
#include "third_party/WebKit/public/web/WebView.h"
-#include "third_party/mojo/src/mojo/edk/js/core.h"
-#include "third_party/mojo/src/mojo/edk/js/support.h"
#include "url/url_util.h"
#if defined(ENABLE_PLUGINS)
@@ -2250,15 +2250,16 @@ void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable(
v8::Isolate* isolate,
v8::Local<v8::Context> context) {
gin::ModuleRegistry* registry = gin::ModuleRegistry::From(context);
- if (registry->available_modules().count(mojo::js::Core::kModuleName))
+ if (registry->available_modules().count(mojo::edk::Core::kModuleName))
return;
v8::HandleScope handle_scope(isolate);
registry->AddBuiltinModule(
- isolate, mojo::js::Core::kModuleName, mojo::js::Core::GetModule(isolate));
+ isolate, mojo::edk::Core::kModuleName,
+ mojo::edk::Core::GetModule(isolate));
registry->AddBuiltinModule(isolate,
- mojo::js::Support::kModuleName,
- mojo::js::Support::GetModule(isolate));
+ mojo::edk::Support::kModuleName,
+ mojo::edk::Support::GetModule(isolate));
registry->AddBuiltinModule(
isolate,
ServiceRegistryJsWrapper::kModuleName,

Powered by Google App Engine
This is Rietveld 408576698