mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: disable JS impl when //extensions support is on (#19512)

Browse source
This commit is contained in:
Jeremy Apthorp 2019-07-31 14:25:41 -07:00 • committed by GitHub
parent a5f87cee6b
commit c71cdce0b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 50 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shell/renderer/atom_render_frame_observer.cc
View file

@ -13,6 +13,7 @@
#include "base/trace_event/trace_event.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "electron/buildflags/buildflags.h"
#include "electron/shell/common/api/api.mojom.h"
#include "ipc/ipc_message_macros.h"
#include "native_mate/dictionary.h"
@ -85,11 +86,13 @@ void AtomRenderFrameObserver::DidCreateScriptContext(
renderer_client_->SetupMainWorldOverrides(context, render_frame_);
}
#if !BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
if (world_id >= World::ISOLATED_WORLD_EXTENSIONS &&
world_id <= World::ISOLATED_WORLD_EXTENSIONS_END) {
renderer_client_->SetupExtensionWorldOverrides(context, render_frame_,
world_id);
}
#endif
}
void AtomRenderFrameObserver::DraggableRegionsChanged() {