From 602913cb4c98d102548e082c97401415849fe082 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Fri, 14 Feb 2020 03:25:39 -0800 Subject: [PATCH] chore: rename node bindings atom => electron (#22176) --- lib/common/asar.js | 4 +- lib/common/electron-binding-setup.ts | 4 +- lib/renderer/content-scripts-injector.ts | 2 +- .../node/feat_initialize_asar_support.patch | 4 +- shell/browser/api/electron_api_app.cc | 2 +- .../browser/api/electron_api_auto_updater.cc | 2 +- .../browser/api/electron_api_browser_view.cc | 2 +- .../api/electron_api_browser_window.cc | 2 +- .../api/electron_api_content_tracing.cc | 2 +- shell/browser/api/electron_api_debugger.cc | 2 +- .../api/electron_api_desktop_capturer.cc | 2 +- shell/browser/api/electron_api_dialog.cc | 2 +- .../browser/api/electron_api_download_item.cc | 2 +- shell/browser/api/electron_api_event.cc | 2 +- .../api/electron_api_global_shortcut.cc | 2 +- .../api/electron_api_in_app_purchase.cc | 2 +- shell/browser/api/electron_api_menu.cc | 2 +- .../browser/api/electron_api_native_theme.cc | 2 +- shell/browser/api/electron_api_net.cc | 2 +- .../browser/api/electron_api_notification.cc | 2 +- .../browser/api/electron_api_power_monitor.cc | 2 +- .../api/electron_api_power_save_blocker.cc | 3 +- shell/browser/api/electron_api_protocol.cc | 2 +- shell/browser/api/electron_api_screen.cc | 2 +- shell/browser/api/electron_api_session.cc | 2 +- .../api/electron_api_system_preferences.cc | 3 +- .../api/electron_api_top_level_window.cc | 2 +- shell/browser/api/electron_api_tray.cc | 2 +- shell/browser/api/electron_api_view.cc | 2 +- .../browser/api/electron_api_web_contents.cc | 2 +- .../api/electron_api_web_contents_view.cc | 2 +- .../api/electron_api_web_view_manager.cc | 2 +- .../api/views/electron_api_box_layout.cc | 2 +- .../browser/api/views/electron_api_button.cc | 2 +- .../api/views/electron_api_label_button.cc | 2 +- .../api/views/electron_api_layout_manager.cc | 2 +- .../api/views/electron_api_md_text_button.cc | 2 +- .../api/views/electron_api_resize_area.cc | 2 +- .../api/views/electron_api_text_field.cc | 2 +- shell/common/api/electron_api_asar.cc | 2 +- shell/common/api/electron_api_clipboard.cc | 2 +- shell/common/api/electron_api_command_line.cc | 2 +- .../common/api/electron_api_crash_reporter.cc | 2 +- shell/common/api/electron_api_native_image.cc | 2 +- shell/common/api/electron_api_shell.cc | 2 +- shell/common/api/electron_api_v8_util.cc | 2 +- shell/common/api/features.cc | 2 +- shell/common/node_bindings.cc | 96 +++++++++---------- .../api/electron_api_context_bridge.cc | 2 +- .../renderer/api/electron_api_renderer_ipc.cc | 2 +- shell/renderer/api/electron_api_web_frame.cc | 2 +- .../electron_render_frame_observer.cc | 2 +- 52 files changed, 104 insertions(+), 102 deletions(-) diff --git a/lib/common/asar.js b/lib/common/asar.js index 091d8b4336..a02e8ac1aa 100644 --- a/lib/common/asar.js +++ b/lib/common/asar.js @@ -1,8 +1,8 @@ 'use strict'; (function () { - const asar = process._linkedBinding('atom_common_asar') - const v8Util = process._linkedBinding('atom_common_v8_util') + const asar = process._linkedBinding('electron_common_asar') + const v8Util = process._linkedBinding('electron_common_v8_util') const { Buffer } = require('buffer') const Module = require('module') const path = require('path') diff --git a/lib/common/electron-binding-setup.ts b/lib/common/electron-binding-setup.ts index fcb79d3126..8f9aba78dd 100644 --- a/lib/common/electron-binding-setup.ts +++ b/lib/common/electron-binding-setup.ts @@ -1,10 +1,10 @@ export function electronBindingSetup (binding: typeof process['_linkedBinding'], processType: typeof process['type']): typeof process['electronBinding'] { return function electronBinding (name: string) { try { - return binding(`atom_${processType}_${name}`) + return binding(`electron_${processType}_${name}`) } catch (error) { if (/No such module/.test(error.message)) { - return binding(`atom_common_${name}`) + return binding(`electron_common_${name}`) } else { throw error } diff --git a/lib/renderer/content-scripts-injector.ts b/lib/renderer/content-scripts-injector.ts index d982377179..2d2dbb714f 100644 --- a/lib/renderer/content-scripts-injector.ts +++ b/lib/renderer/content-scripts-injector.ts @@ -7,7 +7,7 @@ const v8Util = process.electronBinding('v8_util') const IsolatedWorldIDs = { /** * Start of extension isolated world IDs, as defined in - * atom_render_frame_observer.h + * electron_render_frame_observer.h */ ISOLATED_WORLD_EXTENSIONS: 1 << 20 } diff --git a/patches/node/feat_initialize_asar_support.patch b/patches/node/feat_initialize_asar_support.patch index 4a49897b1b..052bfb799e 100644 --- a/patches/node/feat_initialize_asar_support.patch +++ b/patches/node/feat_initialize_asar_support.patch @@ -19,7 +19,7 @@ index 0cad5209c4ff4e68d7c400af1d2b4c234210ddb4..918bc8c0c4e78bad5a3372e8a5522da0 return NativeModule.map.has(id); }; diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js -index 2aa2a3b46c5fc12d22e0e74e304d2d55ca02c3b5..e7bd18855fb98a822833b4366bfb595dccfc1b6f 100644 +index 2aa2a3b46c5fc12d22e0e74e304d2d55ca02c3b5..c86b5851ca9332ca440443e5feab2e65c7ac30b9 100644 --- a/lib/internal/bootstrap/pre_execution.js +++ b/lib/internal/bootstrap/pre_execution.js @@ -61,6 +61,7 @@ function prepareMainThreadExecution(expandArgv1 = false) { @@ -35,7 +35,7 @@ index 2aa2a3b46c5fc12d22e0e74e304d2d55ca02c3b5..e7bd18855fb98a822833b4366bfb595d } +function setupAsarSupport() { -+ process._linkedBinding('atom_common_asar').initAsarSupport(require); ++ process._linkedBinding('electron_common_asar').initAsarSupport(require); +} + module.exports = { diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc index f915a7329c..b83c8ae3e6 100644 --- a/shell/browser/api/electron_api_app.cc +++ b/shell/browser/api/electron_api_app.cc @@ -1544,4 +1544,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_app, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_app, Initialize) diff --git a/shell/browser/api/electron_api_auto_updater.cc b/shell/browser/api/electron_api_auto_updater.cc index 6b82edc2de..e1d8628e40 100644 --- a/shell/browser/api/electron_api_auto_updater.cc +++ b/shell/browser/api/electron_api_auto_updater.cc @@ -161,4 +161,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_auto_updater, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_auto_updater, Initialize) diff --git a/shell/browser/api/electron_api_browser_view.cc b/shell/browser/api/electron_api_browser_view.cc index e6a70b4684..071dea2564 100644 --- a/shell/browser/api/electron_api_browser_view.cc +++ b/shell/browser/api/electron_api_browser_view.cc @@ -172,4 +172,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_browser_view, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_browser_view, Initialize) diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc index 951497daad..966ab3f993 100644 --- a/shell/browser/api/electron_api_browser_window.cc +++ b/shell/browser/api/electron_api_browser_window.cc @@ -535,4 +535,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_window, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_window, Initialize) diff --git a/shell/browser/api/electron_api_content_tracing.cc b/shell/browser/api/electron_api_content_tracing.cc index b03a659292..aaedaa2a79 100644 --- a/shell/browser/api/electron_api_content_tracing.cc +++ b/shell/browser/api/electron_api_content_tracing.cc @@ -162,4 +162,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_content_tracing, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_content_tracing, Initialize) diff --git a/shell/browser/api/electron_api_debugger.cc b/shell/browser/api/electron_api_debugger.cc index c029c891b5..0f25f77576 100644 --- a/shell/browser/api/electron_api_debugger.cc +++ b/shell/browser/api/electron_api_debugger.cc @@ -209,4 +209,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_debugger, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_debugger, Initialize) diff --git a/shell/browser/api/electron_api_desktop_capturer.cc b/shell/browser/api/electron_api_desktop_capturer.cc index 6e6021b7d9..a536fcced6 100644 --- a/shell/browser/api/electron_api_desktop_capturer.cc +++ b/shell/browser/api/electron_api_desktop_capturer.cc @@ -218,4 +218,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_desktop_capturer, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_desktop_capturer, Initialize) diff --git a/shell/browser/api/electron_api_dialog.cc b/shell/browser/api/electron_api_dialog.cc index dcc7b7b9c5..5cc397b77f 100644 --- a/shell/browser/api/electron_api_dialog.cc +++ b/shell/browser/api/electron_api_dialog.cc @@ -104,4 +104,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_dialog, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_dialog, Initialize) diff --git a/shell/browser/api/electron_api_download_item.cc b/shell/browser/api/electron_api_download_item.cc index fb006eae64..c7bd68c978 100644 --- a/shell/browser/api/electron_api_download_item.cc +++ b/shell/browser/api/electron_api_download_item.cc @@ -252,4 +252,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_download_item, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_download_item, Initialize) diff --git a/shell/browser/api/electron_api_event.cc b/shell/browser/api/electron_api_event.cc index c5084fc548..bd7dc33e89 100644 --- a/shell/browser/api/electron_api_event.cc +++ b/shell/browser/api/electron_api_event.cc @@ -25,4 +25,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_event, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_event, Initialize) diff --git a/shell/browser/api/electron_api_global_shortcut.cc b/shell/browser/api/electron_api_global_shortcut.cc index ed99fa729c..954066991e 100644 --- a/shell/browser/api/electron_api_global_shortcut.cc +++ b/shell/browser/api/electron_api_global_shortcut.cc @@ -159,4 +159,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_global_shortcut, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_global_shortcut, Initialize) diff --git a/shell/browser/api/electron_api_in_app_purchase.cc b/shell/browser/api/electron_api_in_app_purchase.cc index 0f9850442a..8f392c1303 100644 --- a/shell/browser/api/electron_api_in_app_purchase.cc +++ b/shell/browser/api/electron_api_in_app_purchase.cc @@ -166,4 +166,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_in_app_purchase, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_in_app_purchase, Initialize) diff --git a/shell/browser/api/electron_api_menu.cc b/shell/browser/api/electron_api_menu.cc index a2f2da9a10..c3f7812933 100644 --- a/shell/browser/api/electron_api_menu.cc +++ b/shell/browser/api/electron_api_menu.cc @@ -287,4 +287,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_menu, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_menu, Initialize) diff --git a/shell/browser/api/electron_api_native_theme.cc b/shell/browser/api/electron_api_native_theme.cc index b12997a0f0..e0d333d838 100644 --- a/shell/browser/api/electron_api_native_theme.cc +++ b/shell/browser/api/electron_api_native_theme.cc @@ -161,4 +161,4 @@ bool Converter::FromV8( } // namespace gin -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_native_theme, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_native_theme, Initialize) diff --git a/shell/browser/api/electron_api_net.cc b/shell/browser/api/electron_api_net.cc index 77e045aa01..647eabc17d 100644 --- a/shell/browser/api/electron_api_net.cc +++ b/shell/browser/api/electron_api_net.cc @@ -80,4 +80,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_net, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_net, Initialize) diff --git a/shell/browser/api/electron_api_notification.cc b/shell/browser/api/electron_api_notification.cc index 7a73471298..1aaedb6701 100644 --- a/shell/browser/api/electron_api_notification.cc +++ b/shell/browser/api/electron_api_notification.cc @@ -294,4 +294,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_notification, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_notification, Initialize) diff --git a/shell/browser/api/electron_api_power_monitor.cc b/shell/browser/api/electron_api_power_monitor.cc index aff350b321..4f9544cbb5 100644 --- a/shell/browser/api/electron_api_power_monitor.cc +++ b/shell/browser/api/electron_api_power_monitor.cc @@ -151,4 +151,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_power_monitor, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_power_monitor, Initialize) diff --git a/shell/browser/api/electron_api_power_save_blocker.cc b/shell/browser/api/electron_api_power_save_blocker.cc index 703f8a870e..7b52165f32 100644 --- a/shell/browser/api/electron_api_power_save_blocker.cc +++ b/shell/browser/api/electron_api_power_save_blocker.cc @@ -146,4 +146,5 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_power_save_blocker, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_power_save_blocker, + Initialize) diff --git a/shell/browser/api/electron_api_protocol.cc b/shell/browser/api/electron_api_protocol.cc index aca1d16653..28e71d2744 100644 --- a/shell/browser/api/electron_api_protocol.cc +++ b/shell/browser/api/electron_api_protocol.cc @@ -325,4 +325,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_protocol, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_protocol, Initialize) diff --git a/shell/browser/api/electron_api_screen.cc b/shell/browser/api/electron_api_screen.cc index f5bdd25451..5b7f901c2a 100644 --- a/shell/browser/api/electron_api_screen.cc +++ b/shell/browser/api/electron_api_screen.cc @@ -193,4 +193,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_screen, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_screen, Initialize) diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc index 7c173c5328..29c2c71ea5 100644 --- a/shell/browser/api/electron_api_session.cc +++ b/shell/browser/api/electron_api_session.cc @@ -1007,4 +1007,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_session, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_session, Initialize) diff --git a/shell/browser/api/electron_api_system_preferences.cc b/shell/browser/api/electron_api_system_preferences.cc index 372c91db8b..f7855d77a6 100644 --- a/shell/browser/api/electron_api_system_preferences.cc +++ b/shell/browser/api/electron_api_system_preferences.cc @@ -150,4 +150,5 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_system_preferences, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_system_preferences, + Initialize) diff --git a/shell/browser/api/electron_api_top_level_window.cc b/shell/browser/api/electron_api_top_level_window.cc index 76989f8aca..53aaf4c288 100644 --- a/shell/browser/api/electron_api_top_level_window.cc +++ b/shell/browser/api/electron_api_top_level_window.cc @@ -1263,4 +1263,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_top_level_window, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_top_level_window, Initialize) diff --git a/shell/browser/api/electron_api_tray.cc b/shell/browser/api/electron_api_tray.cc index 0ca838fb4b..c6131909a0 100644 --- a/shell/browser/api/electron_api_tray.cc +++ b/shell/browser/api/electron_api_tray.cc @@ -320,4 +320,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_tray, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_tray, Initialize) diff --git a/shell/browser/api/electron_api_view.cc b/shell/browser/api/electron_api_view.cc index 832b55292e..0d228c8995 100644 --- a/shell/browser/api/electron_api_view.cc +++ b/shell/browser/api/electron_api_view.cc @@ -86,4 +86,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_view, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_view, Initialize) diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc index 9f53da4bb0..1cb8bf5fda 100644 --- a/shell/browser/api/electron_api_web_contents.cc +++ b/shell/browser/api/electron_api_web_contents.cc @@ -2774,4 +2774,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_web_contents, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_web_contents, Initialize) diff --git a/shell/browser/api/electron_api_web_contents_view.cc b/shell/browser/api/electron_api_web_contents_view.cc index b5e8fcfb3e..8afe20ff34 100644 --- a/shell/browser/api/electron_api_web_contents_view.cc +++ b/shell/browser/api/electron_api_web_contents_view.cc @@ -127,4 +127,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_web_contents_view, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_web_contents_view, Initialize) diff --git a/shell/browser/api/electron_api_web_view_manager.cc b/shell/browser/api/electron_api_web_view_manager.cc index 71f8082826..a0b3cfaf71 100644 --- a/shell/browser/api/electron_api_web_view_manager.cc +++ b/shell/browser/api/electron_api_web_view_manager.cc @@ -52,4 +52,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_web_view_manager, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_web_view_manager, Initialize) diff --git a/shell/browser/api/views/electron_api_box_layout.cc b/shell/browser/api/views/electron_api_box_layout.cc index f4d52e9a5a..35680881b2 100644 --- a/shell/browser/api/views/electron_api_box_layout.cc +++ b/shell/browser/api/views/electron_api_box_layout.cc @@ -84,4 +84,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_box_layout, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_box_layout, Initialize) diff --git a/shell/browser/api/views/electron_api_button.cc b/shell/browser/api/views/electron_api_button.cc index ddfdddbc42..ff753fca8a 100644 --- a/shell/browser/api/views/electron_api_button.cc +++ b/shell/browser/api/views/electron_api_button.cc @@ -56,4 +56,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_button, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_button, Initialize) diff --git a/shell/browser/api/views/electron_api_label_button.cc b/shell/browser/api/views/electron_api_label_button.cc index f5f79a25a6..03ed678f31 100644 --- a/shell/browser/api/views/electron_api_label_button.cc +++ b/shell/browser/api/views/electron_api_label_button.cc @@ -76,4 +76,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_label_button, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_label_button, Initialize) diff --git a/shell/browser/api/views/electron_api_layout_manager.cc b/shell/browser/api/views/electron_api_layout_manager.cc index cb3d349e3d..c8141c34d8 100644 --- a/shell/browser/api/views/electron_api_layout_manager.cc +++ b/shell/browser/api/views/electron_api_layout_manager.cc @@ -60,4 +60,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_layout_manager, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_layout_manager, Initialize) diff --git a/shell/browser/api/views/electron_api_md_text_button.cc b/shell/browser/api/views/electron_api_md_text_button.cc index 67574ec10b..a0ce10d7eb 100644 --- a/shell/browser/api/views/electron_api_md_text_button.cc +++ b/shell/browser/api/views/electron_api_md_text_button.cc @@ -54,4 +54,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_md_text_button, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_md_text_button, Initialize) diff --git a/shell/browser/api/views/electron_api_resize_area.cc b/shell/browser/api/views/electron_api_resize_area.cc index 8c553b1bdc..17d699b3c2 100644 --- a/shell/browser/api/views/electron_api_resize_area.cc +++ b/shell/browser/api/views/electron_api_resize_area.cc @@ -56,4 +56,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_resize_area, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_resize_area, Initialize) diff --git a/shell/browser/api/views/electron_api_text_field.cc b/shell/browser/api/views/electron_api_text_field.cc index 41daf9f015..b227145c7f 100644 --- a/shell/browser/api/views/electron_api_text_field.cc +++ b/shell/browser/api/views/electron_api_text_field.cc @@ -63,4 +63,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_text_field, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_text_field, Initialize) diff --git a/shell/common/api/electron_api_asar.cc b/shell/common/api/electron_api_asar.cc index 5527599efc..c1d5c3bd1e 100644 --- a/shell/common/api/electron_api_asar.cc +++ b/shell/common/api/electron_api_asar.cc @@ -152,4 +152,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_asar, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_asar, Initialize) diff --git a/shell/common/api/electron_api_clipboard.cc b/shell/common/api/electron_api_clipboard.cc index 51e312b389..ebb5594005 100644 --- a/shell/common/api/electron_api_clipboard.cc +++ b/shell/common/api/electron_api_clipboard.cc @@ -242,4 +242,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_clipboard, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_clipboard, Initialize) diff --git a/shell/common/api/electron_api_command_line.cc b/shell/common/api/electron_api_command_line.cc index 656ea0b149..fcabc8d53e 100644 --- a/shell/common/api/electron_api_command_line.cc +++ b/shell/common/api/electron_api_command_line.cc @@ -57,4 +57,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_command_line, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_command_line, Initialize) diff --git a/shell/common/api/electron_api_crash_reporter.cc b/shell/common/api/electron_api_crash_reporter.cc index 61ee66c2fb..eacb66a53b 100644 --- a/shell/common/api/electron_api_crash_reporter.cc +++ b/shell/common/api/electron_api_crash_reporter.cc @@ -64,4 +64,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_crash_reporter, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_crash_reporter, Initialize) diff --git a/shell/common/api/electron_api_native_image.cc b/shell/common/api/electron_api_native_image.cc index 92b43b1489..7c37234636 100644 --- a/shell/common/api/electron_api_native_image.cc +++ b/shell/common/api/electron_api_native_image.cc @@ -592,4 +592,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_native_image, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_native_image, Initialize) diff --git a/shell/common/api/electron_api_shell.cc b/shell/common/api/electron_api_shell.cc index dbb5557e10..f862cce681 100644 --- a/shell/common/api/electron_api_shell.cc +++ b/shell/common/api/electron_api_shell.cc @@ -167,4 +167,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_shell, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_shell, Initialize) diff --git a/shell/common/api/electron_api_v8_util.cc b/shell/common/api/electron_api_v8_util.cc index 3c4476e870..cbda333b66 100644 --- a/shell/common/api/electron_api_v8_util.cc +++ b/shell/common/api/electron_api_v8_util.cc @@ -139,4 +139,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_v8_util, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_v8_util, Initialize) diff --git a/shell/common/api/features.cc b/shell/common/api/features.cc index 64c70b50cc..610f0d1424 100644 --- a/shell/common/api/features.cc +++ b/shell/common/api/features.cc @@ -83,4 +83,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_features, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_features, Initialize) diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc index 487a790777..11a1c1d2d5 100644 --- a/shell/common/node_bindings.cc +++ b/shell/common/node_bindings.cc @@ -32,56 +32,56 @@ #include "shell/common/mac/main_application_bundle.h" #include "shell/common/node_includes.h" -#define ELECTRON_BUILTIN_MODULES(V) \ - V(atom_browser_app) \ - V(atom_browser_auto_updater) \ - V(atom_browser_browser_view) \ - V(atom_browser_content_tracing) \ - V(atom_browser_debugger) \ - V(atom_browser_dialog) \ - V(atom_browser_download_item) \ - V(atom_browser_event) \ - V(atom_browser_global_shortcut) \ - V(atom_browser_in_app_purchase) \ - V(atom_browser_menu) \ - V(atom_browser_net) \ - V(atom_browser_power_monitor) \ - V(atom_browser_power_save_blocker) \ - V(atom_browser_protocol) \ - V(atom_browser_session) \ - V(atom_browser_system_preferences) \ - V(atom_browser_top_level_window) \ - V(atom_browser_tray) \ - V(atom_browser_web_contents) \ - V(atom_browser_web_contents_view) \ - V(atom_browser_view) \ - V(atom_browser_web_view_manager) \ - V(atom_browser_window) \ - V(atom_common_asar) \ - V(atom_common_clipboard) \ - V(atom_common_command_line) \ - V(atom_common_crash_reporter) \ - V(atom_common_features) \ - V(atom_common_native_image) \ - V(atom_common_native_theme) \ - V(atom_common_notification) \ - V(atom_common_screen) \ - V(atom_common_shell) \ - V(atom_common_v8_util) \ - V(atom_renderer_context_bridge) \ - V(atom_renderer_ipc) \ - V(atom_renderer_web_frame) +#define ELECTRON_BUILTIN_MODULES(V) \ + V(electron_browser_app) \ + V(electron_browser_auto_updater) \ + V(electron_browser_browser_view) \ + V(electron_browser_content_tracing) \ + V(electron_browser_debugger) \ + V(electron_browser_dialog) \ + V(electron_browser_download_item) \ + V(electron_browser_event) \ + V(electron_browser_global_shortcut) \ + V(electron_browser_in_app_purchase) \ + V(electron_browser_menu) \ + V(electron_browser_net) \ + V(electron_browser_power_monitor) \ + V(electron_browser_power_save_blocker) \ + V(electron_browser_protocol) \ + V(electron_browser_session) \ + V(electron_browser_system_preferences) \ + V(electron_browser_top_level_window) \ + V(electron_browser_tray) \ + V(electron_browser_web_contents) \ + V(electron_browser_web_contents_view) \ + V(electron_browser_view) \ + V(electron_browser_web_view_manager) \ + V(electron_browser_window) \ + V(electron_common_asar) \ + V(electron_common_clipboard) \ + V(electron_common_command_line) \ + V(electron_common_crash_reporter) \ + V(electron_common_features) \ + V(electron_common_native_image) \ + V(electron_common_native_theme) \ + V(electron_common_notification) \ + V(electron_common_screen) \ + V(electron_common_shell) \ + V(electron_common_v8_util) \ + V(electron_renderer_context_bridge) \ + V(electron_renderer_ipc) \ + V(electron_renderer_web_frame) -#define ELECTRON_VIEW_MODULES(V) \ - V(atom_browser_box_layout) \ - V(atom_browser_button) \ - V(atom_browser_label_button) \ - V(atom_browser_layout_manager) \ - V(atom_browser_md_text_button) \ - V(atom_browser_resize_area) \ - V(atom_browser_text_field) +#define ELECTRON_VIEW_MODULES(V) \ + V(electron_browser_box_layout) \ + V(electron_browser_button) \ + V(electron_browser_label_button) \ + V(electron_browser_layout_manager) \ + V(electron_browser_md_text_button) \ + V(electron_browser_resize_area) \ + V(electron_browser_text_field) -#define ELECTRON_DESKTOP_CAPTURER_MODULE(V) V(atom_browser_desktop_capturer) +#define ELECTRON_DESKTOP_CAPTURER_MODULE(V) V(electron_browser_desktop_capturer) // This is used to load built-in modules. Instead of using // __attribute__((constructor)), we call the _register_ diff --git a/shell/renderer/api/electron_api_context_bridge.cc b/shell/renderer/api/electron_api_context_bridge.cc index 1a84cfb568..93517ada3d 100644 --- a/shell/renderer/api/electron_api_context_bridge.cc +++ b/shell/renderer/api/electron_api_context_bridge.cc @@ -513,4 +513,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_renderer_context_bridge, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_renderer_context_bridge, Initialize) diff --git a/shell/renderer/api/electron_api_renderer_ipc.cc b/shell/renderer/api/electron_api_renderer_ipc.cc index 1720ea8ad1..a2b41cab3f 100644 --- a/shell/renderer/api/electron_api_renderer_ipc.cc +++ b/shell/renderer/api/electron_api_renderer_ipc.cc @@ -149,4 +149,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_renderer_ipc, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_renderer_ipc, Initialize) diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc index 359b58b98c..d6fcc3551a 100644 --- a/shell/renderer/api/electron_api_web_frame.cc +++ b/shell/renderer/api/electron_api_web_frame.cc @@ -595,4 +595,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(atom_renderer_web_frame, Initialize) +NODE_LINKED_MODULE_CONTEXT_AWARE(electron_renderer_web_frame, Initialize) diff --git a/shell/renderer/electron_render_frame_observer.cc b/shell/renderer/electron_render_frame_observer.cc index 7b1e9f1620..2b8d8a2aad 100644 --- a/shell/renderer/electron_render_frame_observer.cc +++ b/shell/renderer/electron_render_frame_observer.cc @@ -66,7 +66,7 @@ void ElectronRenderFrameObserver::DidInstallConditionalFeatures( auto* command_line = base::CommandLine::ForCurrentProcess(); bool use_context_isolation = renderer_client_->isolated_world(); - // This logic matches the EXPLAINED logic in atom_renderer_client.cc + // This logic matches the EXPLAINED logic in electron_renderer_client.cc // to avoid explaining it twice go check that implementation in // DidCreateScriptContext(); bool is_main_world = IsMainWorld(world_id);