Browse Source

chore: rename node bindings atom => electron (#22176)

Jeremy Apthorp 5 years ago
parent
commit
602913cb4c
52 changed files with 106 additions and 104 deletions
  1. 2 2
      lib/common/asar.js
  2. 2 2
      lib/common/electron-binding-setup.ts
  3. 1 1
      lib/renderer/content-scripts-injector.ts
  4. 2 2
      patches/node/feat_initialize_asar_support.patch
  5. 1 1
      shell/browser/api/electron_api_app.cc
  6. 1 1
      shell/browser/api/electron_api_auto_updater.cc
  7. 1 1
      shell/browser/api/electron_api_browser_view.cc
  8. 1 1
      shell/browser/api/electron_api_browser_window.cc
  9. 1 1
      shell/browser/api/electron_api_content_tracing.cc
  10. 1 1
      shell/browser/api/electron_api_debugger.cc
  11. 1 1
      shell/browser/api/electron_api_desktop_capturer.cc
  12. 1 1
      shell/browser/api/electron_api_dialog.cc
  13. 1 1
      shell/browser/api/electron_api_download_item.cc
  14. 1 1
      shell/browser/api/electron_api_event.cc
  15. 1 1
      shell/browser/api/electron_api_global_shortcut.cc
  16. 1 1
      shell/browser/api/electron_api_in_app_purchase.cc
  17. 1 1
      shell/browser/api/electron_api_menu.cc
  18. 1 1
      shell/browser/api/electron_api_native_theme.cc
  19. 1 1
      shell/browser/api/electron_api_net.cc
  20. 1 1
      shell/browser/api/electron_api_notification.cc
  21. 1 1
      shell/browser/api/electron_api_power_monitor.cc
  22. 2 1
      shell/browser/api/electron_api_power_save_blocker.cc
  23. 1 1
      shell/browser/api/electron_api_protocol.cc
  24. 1 1
      shell/browser/api/electron_api_screen.cc
  25. 1 1
      shell/browser/api/electron_api_session.cc
  26. 2 1
      shell/browser/api/electron_api_system_preferences.cc
  27. 1 1
      shell/browser/api/electron_api_top_level_window.cc
  28. 1 1
      shell/browser/api/electron_api_tray.cc
  29. 1 1
      shell/browser/api/electron_api_view.cc
  30. 1 1
      shell/browser/api/electron_api_web_contents.cc
  31. 1 1
      shell/browser/api/electron_api_web_contents_view.cc
  32. 1 1
      shell/browser/api/electron_api_web_view_manager.cc
  33. 1 1
      shell/browser/api/views/electron_api_box_layout.cc
  34. 1 1
      shell/browser/api/views/electron_api_button.cc
  35. 1 1
      shell/browser/api/views/electron_api_label_button.cc
  36. 1 1
      shell/browser/api/views/electron_api_layout_manager.cc
  37. 1 1
      shell/browser/api/views/electron_api_md_text_button.cc
  38. 1 1
      shell/browser/api/views/electron_api_resize_area.cc
  39. 1 1
      shell/browser/api/views/electron_api_text_field.cc
  40. 1 1
      shell/common/api/electron_api_asar.cc
  41. 1 1
      shell/common/api/electron_api_clipboard.cc
  42. 1 1
      shell/common/api/electron_api_command_line.cc
  43. 1 1
      shell/common/api/electron_api_crash_reporter.cc
  44. 1 1
      shell/common/api/electron_api_native_image.cc
  45. 1 1
      shell/common/api/electron_api_shell.cc
  46. 1 1
      shell/common/api/electron_api_v8_util.cc
  47. 1 1
      shell/common/api/features.cc
  48. 50 50
      shell/common/node_bindings.cc
  49. 1 1
      shell/renderer/api/electron_api_context_bridge.cc
  50. 1 1
      shell/renderer/api/electron_api_renderer_ipc.cc
  51. 1 1
      shell/renderer/api/electron_api_web_frame.cc
  52. 1 1
      shell/renderer/electron_render_frame_observer.cc

+ 2 - 2
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')

+ 2 - 2
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
       }

+ 1 - 1
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
 }

+ 2 - 2
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 = {

+ 1 - 1
shell/browser/api/electron_api_app.cc

@@ -1544,4 +1544,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_app, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_app, Initialize)

+ 1 - 1
shell/browser/api/electron_api_auto_updater.cc

@@ -161,4 +161,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_auto_updater, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_auto_updater, Initialize)

+ 1 - 1
shell/browser/api/electron_api_browser_view.cc

@@ -172,4 +172,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_browser_view, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_browser_view, Initialize)

+ 1 - 1
shell/browser/api/electron_api_browser_window.cc

@@ -535,4 +535,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_window, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_window, Initialize)

+ 1 - 1
shell/browser/api/electron_api_content_tracing.cc

@@ -162,4 +162,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_content_tracing, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_content_tracing, Initialize)

+ 1 - 1
shell/browser/api/electron_api_debugger.cc

@@ -209,4 +209,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_debugger, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_debugger, Initialize)

+ 1 - 1
shell/browser/api/electron_api_desktop_capturer.cc

@@ -218,4 +218,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_desktop_capturer, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_desktop_capturer, Initialize)

+ 1 - 1
shell/browser/api/electron_api_dialog.cc

@@ -104,4 +104,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_dialog, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_dialog, Initialize)

+ 1 - 1
shell/browser/api/electron_api_download_item.cc

@@ -252,4 +252,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_download_item, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_download_item, Initialize)

+ 1 - 1
shell/browser/api/electron_api_event.cc

@@ -25,4 +25,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_event, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_event, Initialize)

+ 1 - 1
shell/browser/api/electron_api_global_shortcut.cc

@@ -159,4 +159,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_global_shortcut, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_global_shortcut, Initialize)

+ 1 - 1
shell/browser/api/electron_api_in_app_purchase.cc

@@ -166,4 +166,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_in_app_purchase, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_in_app_purchase, Initialize)

+ 1 - 1
shell/browser/api/electron_api_menu.cc

@@ -287,4 +287,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_menu, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_menu, Initialize)

+ 1 - 1
shell/browser/api/electron_api_native_theme.cc

@@ -161,4 +161,4 @@ bool Converter<ui::NativeTheme::ThemeSource>::FromV8(
 
 }  // namespace gin
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_native_theme, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_native_theme, Initialize)

+ 1 - 1
shell/browser/api/electron_api_net.cc

@@ -80,4 +80,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_net, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_net, Initialize)

+ 1 - 1
shell/browser/api/electron_api_notification.cc

@@ -294,4 +294,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_notification, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_notification, Initialize)

+ 1 - 1
shell/browser/api/electron_api_power_monitor.cc

@@ -151,4 +151,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_power_monitor, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_power_monitor, Initialize)

+ 2 - 1
shell/browser/api/electron_api_power_save_blocker.cc

@@ -146,4 +146,5 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_power_save_blocker, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_power_save_blocker,
+                                 Initialize)

+ 1 - 1
shell/browser/api/electron_api_protocol.cc

@@ -325,4 +325,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_protocol, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_protocol, Initialize)

+ 1 - 1
shell/browser/api/electron_api_screen.cc

@@ -193,4 +193,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_screen, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_screen, Initialize)

+ 1 - 1
shell/browser/api/electron_api_session.cc

@@ -1007,4 +1007,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_session, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_session, Initialize)

+ 2 - 1
shell/browser/api/electron_api_system_preferences.cc

@@ -150,4 +150,5 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_system_preferences, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_system_preferences,
+                                 Initialize)

+ 1 - 1
shell/browser/api/electron_api_top_level_window.cc

@@ -1263,4 +1263,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_top_level_window, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_top_level_window, Initialize)

+ 1 - 1
shell/browser/api/electron_api_tray.cc

@@ -320,4 +320,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_tray, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_tray, Initialize)

+ 1 - 1
shell/browser/api/electron_api_view.cc

@@ -86,4 +86,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_view, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_view, Initialize)

+ 1 - 1
shell/browser/api/electron_api_web_contents.cc

@@ -2774,4 +2774,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_web_contents, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_web_contents, Initialize)

+ 1 - 1
shell/browser/api/electron_api_web_contents_view.cc

@@ -127,4 +127,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_web_contents_view, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_web_contents_view, Initialize)

+ 1 - 1
shell/browser/api/electron_api_web_view_manager.cc

@@ -52,4 +52,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_web_view_manager, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_web_view_manager, Initialize)

+ 1 - 1
shell/browser/api/views/electron_api_box_layout.cc

@@ -84,4 +84,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_box_layout, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_box_layout, Initialize)

+ 1 - 1
shell/browser/api/views/electron_api_button.cc

@@ -56,4 +56,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_button, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_button, Initialize)

+ 1 - 1
shell/browser/api/views/electron_api_label_button.cc

@@ -76,4 +76,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_label_button, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_label_button, Initialize)

+ 1 - 1
shell/browser/api/views/electron_api_layout_manager.cc

@@ -60,4 +60,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_layout_manager, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_layout_manager, Initialize)

+ 1 - 1
shell/browser/api/views/electron_api_md_text_button.cc

@@ -54,4 +54,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_md_text_button, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_md_text_button, Initialize)

+ 1 - 1
shell/browser/api/views/electron_api_resize_area.cc

@@ -56,4 +56,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_resize_area, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_resize_area, Initialize)

+ 1 - 1
shell/browser/api/views/electron_api_text_field.cc

@@ -63,4 +63,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_browser_text_field, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_text_field, Initialize)

+ 1 - 1
shell/common/api/electron_api_asar.cc

@@ -152,4 +152,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_asar, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_asar, Initialize)

+ 1 - 1
shell/common/api/electron_api_clipboard.cc

@@ -242,4 +242,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_clipboard, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_clipboard, Initialize)

+ 1 - 1
shell/common/api/electron_api_command_line.cc

@@ -57,4 +57,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_command_line, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_command_line, Initialize)

+ 1 - 1
shell/common/api/electron_api_crash_reporter.cc

@@ -64,4 +64,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_crash_reporter, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_crash_reporter, Initialize)

+ 1 - 1
shell/common/api/electron_api_native_image.cc

@@ -592,4 +592,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_native_image, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_native_image, Initialize)

+ 1 - 1
shell/common/api/electron_api_shell.cc

@@ -167,4 +167,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_shell, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_shell, Initialize)

+ 1 - 1
shell/common/api/electron_api_v8_util.cc

@@ -139,4 +139,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_v8_util, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_v8_util, Initialize)

+ 1 - 1
shell/common/api/features.cc

@@ -83,4 +83,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_common_features, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_features, Initialize)

+ 50 - 50
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_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_DESKTOP_CAPTURER_MODULE(V) V(atom_browser_desktop_capturer)
+#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(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(electron_browser_desktop_capturer)
 
 // This is used to load built-in modules. Instead of using
 // __attribute__((constructor)), we call the _register_<modname>

+ 1 - 1
shell/renderer/api/electron_api_context_bridge.cc

@@ -513,4 +513,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_renderer_context_bridge, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_renderer_context_bridge, Initialize)

+ 1 - 1
shell/renderer/api/electron_api_renderer_ipc.cc

@@ -149,4 +149,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_renderer_ipc, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_renderer_ipc, Initialize)

+ 1 - 1
shell/renderer/api/electron_api_web_frame.cc

@@ -595,4 +595,4 @@ void Initialize(v8::Local<v8::Object> exports,
 
 }  // namespace
 
-NODE_LINKED_MODULE_CONTEXT_AWARE(atom_renderer_web_frame, Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_renderer_web_frame, Initialize)

+ 1 - 1
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);