diff options
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/BUILD.gn | 2 | ||||
| -rw-r--r-- | content/renderer/mojo/service_registry_js_wrapper.cc | 2 | ||||
| -rw-r--r-- | content/renderer/render_frame_impl.cc | 15 |
3 files changed, 9 insertions, 10 deletions
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index 3b51c57..fa2c337 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -58,6 +58,7 @@ source_set("renderer") { "//media/midi", "//mojo/common", "//mojo/converters/geometry", + "//mojo/edk/js", "//mojo/environment:chromium", "//mojo/public/cpp/bindings", "//mojo/public/js", @@ -72,7 +73,6 @@ source_set("renderer") { "//third_party/icu", "//third_party/libjingle", "//third_party/libyuv", - "//third_party/mojo/src/mojo/edk/js", "//third_party/npapi", "//third_party/widevine/cdm:version_h", "//ui/accessibility", diff --git a/content/renderer/mojo/service_registry_js_wrapper.cc b/content/renderer/mojo/service_registry_js_wrapper.cc index 3dc56cf..e45decc 100644 --- a/content/renderer/mojo/service_registry_js_wrapper.cc +++ b/content/renderer/mojo/service_registry_js_wrapper.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "content/common/mojo/service_registry_impl.h" #include "content/public/common/service_registry.h" -#include "third_party/mojo/src/mojo/edk/js/handle.h" +#include "mojo/edk/js/handle.h" #include "v8/include/v8.h" namespace content { diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index bbe270a..24747fa 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" @@ -178,8 +180,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) @@ -2381,15 +2381,14 @@ 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::js::Core::kModuleName)) return; v8::HandleScope handle_scope(isolate); - registry->AddBuiltinModule( - isolate, mojo::js::Core::kModuleName, mojo::js::Core::GetModule(isolate)); - registry->AddBuiltinModule(isolate, - mojo::js::Support::kModuleName, - mojo::js::Support::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, ServiceRegistryJsWrapper::kModuleName, |