X Tutup
Skip to content

Commit d9321f4

Browse files
nornagonnornagon
authored
chore: rename atom -> electron (electron#21986)
1 parent f14fc4b commit d9321f4

File tree

287 files changed

+1771
-1708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+1771
-1708
lines changed

‎BUILD.gn‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -136,20 +136,20 @@ webpack_build("electron_content_script_bundle") {
136136
out_file = "$target_gen_dir/js2c/content_script_bundle.js"
137137
}
138138

139-
copy("atom_js2c_copy") {
139+
copy("electron_js2c_copy") {
140140
sources = [
141141
"lib/common/asar.js",
142142
"lib/common/asar_init.js",
143143
]
144144
outputs = [ "$target_gen_dir/js2c/{{source_file_part}}" ]
145145
}
146146

147-
action("atom_js2c") {
147+
action("electron_js2c") {
148148
deps = [
149-
":atom_js2c_copy",
150149
":electron_browser_bundle",
151150
":electron_content_script_bundle",
152151
":electron_isolated_renderer_bundle",
152+
":electron_js2c_copy",
153153
":electron_renderer_bundle",
154154
":electron_sandboxed_renderer_bundle",
155155
":electron_worker_bundle",
@@ -170,7 +170,7 @@ action("atom_js2c") {
170170
]
171171

172172
inputs = sources + [ "//third_party/electron_node/tools/js2c.py" ]
173-
outputs = [ "$root_gen_dir/atom_natives.cc" ]
173+
outputs = [ "$root_gen_dir/electron_natives.cc" ]
174174

175175
script = "tools/js2c.py"
176176
args = [ rebase_path("//third_party/electron_node") ] +
@@ -312,7 +312,7 @@ source_set("electron_lib") {
312312
]
313313

314314
deps = [
315-
":atom_js2c",
315+
":electron_js2c",
316316
":electron_version_header",
317317
":manifests",
318318
":resources",
@@ -468,7 +468,7 @@ source_set("electron_lib") {
468468
"shell/browser/ui/views/autofill_popup_view.h",
469469
]
470470
if (is_mas_build) {
471-
sources += [ "shell/browser/api/atom_api_app_mas.mm" ]
471+
sources += [ "shell/browser/api/electron_api_app_mas.mm" ]
472472
sources -= [
473473
"shell/browser/auto_updater_mac.mm",
474474
"shell/common/crash_reporter/crash_reporter_mac.h",
@@ -595,27 +595,27 @@ source_set("electron_lib") {
595595
deps += [ "//third_party/webrtc/modules/desktop_capture" ]
596596
}
597597
sources += [
598-
"shell/browser/api/atom_api_desktop_capturer.cc",
599-
"shell/browser/api/atom_api_desktop_capturer.h",
598+
"shell/browser/api/electron_api_desktop_capturer.cc",
599+
"shell/browser/api/electron_api_desktop_capturer.h",
600600
]
601601
}
602602

603603
if (enable_view_api) {
604604
sources += [
605-
"shell/browser/api/views/atom_api_box_layout.cc",
606-
"shell/browser/api/views/atom_api_box_layout.h",
607-
"shell/browser/api/views/atom_api_button.cc",
608-
"shell/browser/api/views/atom_api_button.h",
609-
"shell/browser/api/views/atom_api_label_button.cc",
610-
"shell/browser/api/views/atom_api_label_button.h",
611-
"shell/browser/api/views/atom_api_layout_manager.cc",
612-
"shell/browser/api/views/atom_api_layout_manager.h",
613-
"shell/browser/api/views/atom_api_md_text_button.cc",
614-
"shell/browser/api/views/atom_api_md_text_button.h",
615-
"shell/browser/api/views/atom_api_resize_area.cc",
616-
"shell/browser/api/views/atom_api_resize_area.h",
617-
"shell/browser/api/views/atom_api_text_field.cc",
618-
"shell/browser/api/views/atom_api_text_field.h",
605+
"shell/browser/api/views/electron_api_box_layout.cc",
606+
"shell/browser/api/views/electron_api_box_layout.h",
607+
"shell/browser/api/views/electron_api_button.cc",
608+
"shell/browser/api/views/electron_api_button.h",
609+
"shell/browser/api/views/electron_api_label_button.cc",
610+
"shell/browser/api/views/electron_api_label_button.h",
611+
"shell/browser/api/views/electron_api_layout_manager.cc",
612+
"shell/browser/api/views/electron_api_layout_manager.h",
613+
"shell/browser/api/views/electron_api_md_text_button.cc",
614+
"shell/browser/api/views/electron_api_md_text_button.h",
615+
"shell/browser/api/views/electron_api_resize_area.cc",
616+
"shell/browser/api/views/electron_api_resize_area.h",
617+
"shell/browser/api/views/electron_api_text_field.cc",
618+
"shell/browser/api/views/electron_api_text_field.h",
619619
]
620620
}
621621

@@ -816,7 +816,7 @@ if (is_mac) {
816816
}
817817
defines = [ "HELPER_EXECUTABLE" ]
818818
sources = filenames.app_sources
819-
sources += [ "shell/common/atom_constants.cc" ]
819+
sources += [ "shell/common/electron_constants.cc" ]
820820
include_dirs = [ "." ]
821821
info_plist = "shell/renderer/resources/mac/Info.plist"
822822
extra_substitutions =
@@ -918,7 +918,7 @@ if (is_mac) {
918918
mac_app_bundle("electron_app") {
919919
output_name = electron_product_name
920920
sources = filenames.app_sources
921-
sources += [ "shell/common/atom_constants.cc" ]
921+
sources += [ "shell/common/electron_constants.cc" ]
922922
include_dirs = [ "." ]
923923
deps = [
924924
":electron_app_framework_bundle_data",

‎chromium_src/chrome/browser/process_singleton_posix.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#include <stddef.h>
5757

5858
#include "shell/browser/browser.h"
59-
#include "shell/common/atom_command_line.h"
59+
#include "shell/common/electron_command_line.h"
6060

6161
#include "base/base_paths.h"
6262
#include "base/bind.h"
@@ -826,7 +826,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
826826
return PROCESS_NONE;
827827
to_send.append(current_dir.value());
828828

829-
const std::vector<std::string>& argv = electron::AtomCommandLine::argv();
829+
const std::vector<std::string>& argv = electron::ElectronCommandLine::argv();
830830
for (std::vector<std::string>::const_iterator it = argv.begin();
831831
it != argv.end(); ++it) {
832832
to_send.push_back(kTokenDelimiter);

0 commit comments

Comments
 (0)
X Tutup