diff --git a/BUILD.gn b/BUILD.gn index 7c1cdff21a..2667c3d8db 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -543,7 +543,6 @@ source_set("electron_lib") { if (is_mac) { deps += [ - ":electron_lib_arc", "//components/remote_cocoa/app_shim", "//components/remote_cocoa/browser", "//content/browser:mac_helpers", @@ -745,62 +744,6 @@ source_set("electron_lib") { } } -if (is_mac) { - source_set("electron_lib_arc") { - public_configs = [ ":branding" ] - include_dirs = [ "." ] - sources = [ - "shell/app/electron_main_delegate_mac.h", - "shell/app/electron_main_delegate_mac.mm", - "shell/browser/api/electron_api_menu_mac.h", - "shell/browser/api/electron_api_menu_mac.mm", - "shell/browser/api/electron_api_native_theme_mac.mm", - "shell/browser/api/electron_api_push_notifications_mac.mm", - "shell/browser/api/electron_api_system_preferences_mac.mm", - "shell/browser/browser_mac.mm", - "shell/browser/electron_browser_main_parts_mac.mm", - "shell/browser/mac/dict_util.h", - "shell/browser/mac/dict_util.mm", - "shell/browser/mac/electron_application.h", - "shell/browser/mac/electron_application.mm", - "shell/browser/mac/electron_application_delegate.h", - "shell/browser/mac/electron_application_delegate.mm", - "shell/browser/native_window_mac.h", - "shell/browser/native_window_mac.mm", - "shell/browser/ui/cocoa/delayed_native_view_host.h", - "shell/browser/ui/cocoa/delayed_native_view_host.mm", - "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h", - "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm", - "shell/browser/ui/cocoa/electron_menu_controller.mm", - "shell/browser/ui/cocoa/electron_ns_window.h", - "shell/browser/ui/cocoa/electron_ns_window.mm", - "shell/browser/ui/cocoa/electron_ns_window_delegate.h", - "shell/browser/ui/cocoa/electron_ns_window_delegate.mm", - "shell/browser/ui/cocoa/electron_touch_bar.h", - "shell/browser/ui/cocoa/electron_touch_bar.mm", - "shell/browser/ui/inspectable_web_contents_view_mac.h", - "shell/browser/ui/inspectable_web_contents_view_mac.mm", - "shell/browser/ui/tray_icon_cocoa.h", - "shell/browser/ui/tray_icon_cocoa.mm", - ] - - deps = [ - "buildflags", - "shell/common/api:mojo", - "//base", - "//skia", - "//third_party/electron_node:node_lib", - "//third_party/webrtc_overrides:webrtc_component", - "//v8", - ] - - configs += [ - "//electron/build/config:mas_build", - "//third_party/electron_node:node_internals", - ] - } -} - electron_paks("packed_resources") { if (is_mac) { output_dir = "$root_gen_dir/electron_repack" diff --git a/chromium_src/BUILD.gn b/chromium_src/BUILD.gn index a6f7bffe75..ce7bb0428c 100644 --- a/chromium_src/BUILD.gn +++ b/chromium_src/BUILD.gn @@ -213,7 +213,20 @@ static_library("chrome") { } if (is_mac) { - public_deps += [ ":chrome_lib_arc" ] + sources += [ + "//chrome/browser/extensions/global_shortcut_listener_mac.h", + "//chrome/browser/extensions/global_shortcut_listener_mac.mm", + "//chrome/browser/icon_loader_mac.mm", + "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h", + "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm", + "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h", + "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm", + "//chrome/browser/media/webrtc/window_icon_util_mac.mm", + "//chrome/browser/platform_util_mac.mm", + "//chrome/browser/process_singleton_mac.mm", + "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h", + "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm", + ] } if (enable_widevine) { @@ -329,34 +342,6 @@ static_library("chrome") { } } -if (is_mac) { - source_set("chrome_lib_arc") { - include_dirs = [ "." ] - sources = [ - "//chrome/browser/extensions/global_shortcut_listener_mac.h", - "//chrome/browser/extensions/global_shortcut_listener_mac.mm", - "//chrome/browser/icon_loader_mac.mm", - "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h", - "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm", - "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h", - "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm", - "//chrome/browser/media/webrtc/window_icon_util_mac.mm", - "//chrome/browser/platform_util_mac.mm", - "//chrome/browser/process_singleton_mac.mm", - "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h", - "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm", - ] - - deps = [ - "//base", - "//skia", - "//third_party/electron_node:node_lib", - "//third_party/webrtc_overrides:webrtc_component", - "//v8", - ] - } -} - source_set("plugins") { sources = [] deps = [] diff --git a/filenames.gni b/filenames.gni index c06f6ba484..577681a9d2 100644 --- a/filenames.gni +++ b/filenames.gni @@ -116,10 +116,25 @@ filenames = { ] lib_sources_mac = [ + "shell/app/electron_main_delegate_mac.h", + "shell/app/electron_main_delegate_mac.mm", "shell/browser/api/electron_api_app_mac.mm", + "shell/browser/api/electron_api_menu_mac.h", + "shell/browser/api/electron_api_menu_mac.mm", + "shell/browser/api/electron_api_native_theme_mac.mm", "shell/browser/api/electron_api_power_monitor_mac.mm", + "shell/browser/api/electron_api_push_notifications_mac.mm", + "shell/browser/api/electron_api_system_preferences_mac.mm", "shell/browser/api/electron_api_web_contents_mac.mm", "shell/browser/auto_updater_mac.mm", + "shell/browser/browser_mac.mm", + "shell/browser/electron_browser_main_parts_mac.mm", + "shell/browser/mac/dict_util.h", + "shell/browser/mac/dict_util.mm", + "shell/browser/mac/electron_application.h", + "shell/browser/mac/electron_application.mm", + "shell/browser/mac/electron_application_delegate.h", + "shell/browser/mac/electron_application_delegate.mm", "shell/browser/mac/in_app_purchase_observer.h", "shell/browser/mac/in_app_purchase_observer.mm", "shell/browser/mac/in_app_purchase_product.h", @@ -128,6 +143,8 @@ filenames = { "shell/browser/mac/in_app_purchase.mm", "shell/browser/native_browser_view_mac.h", "shell/browser/native_browser_view_mac.mm", + "shell/browser/native_window_mac.h", + "shell/browser/native_window_mac.mm", "shell/browser/notifications/mac/cocoa_notification.h", "shell/browser/notifications/mac/cocoa_notification.mm", "shell/browser/notifications/mac/notification_center_delegate.h", @@ -138,15 +155,26 @@ filenames = { "shell/browser/osr/osr_web_contents_view_mac.mm", "shell/browser/relauncher_mac.cc", "shell/browser/ui/certificate_trust_mac.mm", + "shell/browser/ui/cocoa/delayed_native_view_host.h", + "shell/browser/ui/cocoa/delayed_native_view_host.mm", "shell/browser/ui/cocoa/electron_bundle_mover.h", "shell/browser/ui/cocoa/electron_bundle_mover.mm", + "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h", + "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm", "shell/browser/ui/cocoa/electron_menu_controller.h", + "shell/browser/ui/cocoa/electron_menu_controller.mm", "shell/browser/ui/cocoa/electron_native_widget_mac.h", "shell/browser/ui/cocoa/electron_native_widget_mac.mm", "shell/browser/ui/cocoa/electron_ns_panel.h", "shell/browser/ui/cocoa/electron_ns_panel.mm", + "shell/browser/ui/cocoa/electron_ns_window.h", + "shell/browser/ui/cocoa/electron_ns_window.mm", + "shell/browser/ui/cocoa/electron_ns_window_delegate.h", + "shell/browser/ui/cocoa/electron_ns_window_delegate.mm", "shell/browser/ui/cocoa/electron_preview_item.h", "shell/browser/ui/cocoa/electron_preview_item.mm", + "shell/browser/ui/cocoa/electron_touch_bar.h", + "shell/browser/ui/cocoa/electron_touch_bar.mm", "shell/browser/ui/cocoa/event_dispatching_window.h", "shell/browser/ui/cocoa/event_dispatching_window.mm", "shell/browser/ui/cocoa/NSString+ANSI.h", @@ -159,7 +187,11 @@ filenames = { "shell/browser/ui/cocoa/window_buttons_proxy.mm", "shell/browser/ui/drag_util_mac.mm", "shell/browser/ui/file_dialog_mac.mm", + "shell/browser/ui/inspectable_web_contents_view_mac.h", + "shell/browser/ui/inspectable_web_contents_view_mac.mm", "shell/browser/ui/message_box_mac.mm", + "shell/browser/ui/tray_icon_cocoa.h", + "shell/browser/ui/tray_icon_cocoa.mm", "shell/common/api/electron_api_clipboard_mac.mm", "shell/common/api/electron_api_native_image_mac.mm", "shell/common/asar/archive_mac.mm", diff --git a/shell/app/electron_main_delegate_mac.mm b/shell/app/electron_main_delegate_mac.mm index 15d74b3279..04d39e5918 100644 --- a/shell/app/electron_main_delegate_mac.mm +++ b/shell/app/electron_main_delegate_mac.mm @@ -18,10 +18,6 @@ #include "shell/common/application_info.h" #include "shell/common/mac/main_application_bundle.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron { namespace { diff --git a/shell/browser/api/electron_api_menu_mac.h b/shell/browser/api/electron_api_menu_mac.h index b2f6885590..31fa16be95 100644 --- a/shell/browser/api/electron_api_menu_mac.h +++ b/shell/browser/api/electron_api_menu_mac.h @@ -11,10 +11,6 @@ #import "shell/browser/ui/cocoa/electron_menu_controller.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron::api { class MenuMac : public Menu { diff --git a/shell/browser/api/electron_api_native_theme_mac.mm b/shell/browser/api/electron_api_native_theme_mac.mm index a3ecff5659..ec409e5df5 100644 --- a/shell/browser/api/electron_api_native_theme_mac.mm +++ b/shell/browser/api/electron_api_native_theme_mac.mm @@ -6,10 +6,6 @@ #include "shell/browser/mac/electron_application.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron::api { void NativeTheme::UpdateMacOSAppearanceForOverrideValue( diff --git a/shell/browser/api/electron_api_push_notifications_mac.mm b/shell/browser/api/electron_api_push_notifications_mac.mm index cc5f228dc9..b9f3de1744 100644 --- a/shell/browser/api/electron_api_push_notifications_mac.mm +++ b/shell/browser/api/electron_api_push_notifications_mac.mm @@ -12,10 +12,6 @@ #include "shell/common/gin_converters/value_converter.h" #include "shell/common/gin_helper/promise.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron::api { v8::Local PushNotifications::RegisterForAPNSNotifications( diff --git a/shell/browser/api/electron_api_system_preferences_mac.mm b/shell/browser/api/electron_api_system_preferences_mac.mm index fa7f9f28b0..a67be46f6f 100644 --- a/shell/browser/api/electron_api_system_preferences_mac.mm +++ b/shell/browser/api/electron_api_system_preferences_mac.mm @@ -30,10 +30,6 @@ #include "skia/ext/skia_utils_mac.h" #include "ui/native_theme/native_theme.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace gin { template <> diff --git a/shell/browser/browser_mac.mm b/shell/browser/browser_mac.mm index 34c972cf93..b90430199a 100644 --- a/shell/browser/browser_mac.mm +++ b/shell/browser/browser_mac.mm @@ -36,10 +36,6 @@ #include "ui/gfx/image/image.h" #include "url/gurl.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron { namespace { diff --git a/shell/browser/electron_browser_main_parts_mac.mm b/shell/browser/electron_browser_main_parts_mac.mm index b916880554..c7705f9173 100644 --- a/shell/browser/electron_browser_main_parts_mac.mm +++ b/shell/browser/electron_browser_main_parts_mac.mm @@ -12,15 +12,11 @@ #include "services/device/public/cpp/geolocation/geolocation_manager.h" #include "services/device/public/cpp/geolocation/system_geolocation_source_mac.h" #include "shell/browser/browser_process_impl.h" -#import "shell/browser/mac/electron_application.h" +#include "shell/browser/mac/electron_application.h" #include "shell/browser/mac/electron_application_delegate.h" #include "shell/common/electron_paths.h" #include "ui/base/l10n/l10n_util_mac.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron { static ElectronApplicationDelegate* __strong delegate_; diff --git a/shell/browser/mac/dict_util.mm b/shell/browser/mac/dict_util.mm index 80aedd6fe9..dec0d95069 100644 --- a/shell/browser/mac/dict_util.mm +++ b/shell/browser/mac/dict_util.mm @@ -10,10 +10,6 @@ #include "base/strings/sys_string_conversions.h" #include "base/values.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron { NSArray* ListValueToNSArray(const base::Value::List& value) { diff --git a/shell/browser/mac/electron_application.h b/shell/browser/mac/electron_application.h index 00c5649ad5..0baf1c5694 100644 --- a/shell/browser/mac/electron_application.h +++ b/shell/browser/mac/electron_application.h @@ -11,10 +11,6 @@ #import #import -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - @interface AtomApplication : NSApplication { diff --git a/shell/browser/mac/electron_application_delegate.mm b/shell/browser/mac/electron_application_delegate.mm index 7bbdfd36d6..f91de41d14 100644 --- a/shell/browser/mac/electron_application_delegate.mm +++ b/shell/browser/mac/electron_application_delegate.mm @@ -19,10 +19,6 @@ #import -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - static NSDictionary* UNNotificationResponseToNSDictionary( UNNotificationResponse* response) { if (![response respondsToSelector:@selector(actionIdentifier)] || diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm index b6ce683db3..8720028076 100644 --- a/shell/browser/native_window_mac.mm +++ b/shell/browser/native_window_mac.mm @@ -52,10 +52,6 @@ #include "ui/views/widget/widget.h" #include "ui/views/window/native_frame_view_mac.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - @interface ElectronProgressBar : NSProgressIndicator @end diff --git a/shell/browser/ui/cocoa/delayed_native_view_host.mm b/shell/browser/ui/cocoa/delayed_native_view_host.mm index 289f824e0b..50d178a1f9 100644 --- a/shell/browser/ui/cocoa/delayed_native_view_host.mm +++ b/shell/browser/ui/cocoa/delayed_native_view_host.mm @@ -6,10 +6,6 @@ #include "base/apple/owned_objc.h" #include "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron { DelayedNativeViewHost::DelayedNativeViewHost(gfx::NativeView native_view) diff --git a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h index 9492feeab0..ea7de51839 100644 --- a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h +++ b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h @@ -12,10 +12,6 @@ #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h" #include "ui/base/cocoa/base_view.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron { class InspectableWebContentsViewMac; } diff --git a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm index edaa6f1e31..c4ab6a9f6d 100644 --- a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm +++ b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm @@ -13,10 +13,6 @@ #include "ui/base/cocoa/base_view.h" #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - @implementation ElectronInspectableWebContentsView - (instancetype)initWithInspectableWebContentsViewMac: diff --git a/shell/browser/ui/cocoa/electron_menu_controller.h b/shell/browser/ui/cocoa/electron_menu_controller.h index 633d97fddc..a821f0b12b 100644 --- a/shell/browser/ui/cocoa/electron_menu_controller.h +++ b/shell/browser/ui/cocoa/electron_menu_controller.h @@ -11,10 +11,6 @@ #include "base/functional/callback.h" #include "base/memory/weak_ptr.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron { class ElectronMenuModel; } diff --git a/shell/browser/ui/cocoa/electron_ns_window.mm b/shell/browser/ui/cocoa/electron_ns_window.mm index 574adfc321..ae4e96859b 100644 --- a/shell/browser/ui/cocoa/electron_ns_window.mm +++ b/shell/browser/ui/cocoa/electron_ns_window.mm @@ -14,10 +14,6 @@ #import #import -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron { int ScopedDisableResize::disable_resize_ = 0; diff --git a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm index b5b914b0fa..c562f3c70c 100644 --- a/shell/browser/ui/cocoa/electron_ns_window_delegate.mm +++ b/shell/browser/ui/cocoa/electron_ns_window_delegate.mm @@ -17,10 +17,6 @@ #include "ui/views/cocoa/native_widget_mac_ns_window_host.h" #include "ui/views/widget/native_widget_mac.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - using TitleBarStyle = electron::NativeWindowMac::TitleBarStyle; using FullScreenTransitionState = electron::NativeWindow::FullScreenTransitionState; diff --git a/shell/browser/ui/cocoa/electron_touch_bar.h b/shell/browser/ui/cocoa/electron_touch_bar.h index a83457388f..2fae6144d0 100644 --- a/shell/browser/ui/cocoa/electron_touch_bar.h +++ b/shell/browser/ui/cocoa/electron_touch_bar.h @@ -15,10 +15,6 @@ #include "shell/browser/native_window.h" #include "shell/common/gin_helper/persistent_dictionary.h" -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - @interface ElectronTouchBar : NSObject { diff --git a/shell/browser/ui/inspectable_web_contents_view_mac.h b/shell/browser/ui/inspectable_web_contents_view_mac.h index 46ab871d8e..e4a7add218 100644 --- a/shell/browser/ui/inspectable_web_contents_view_mac.h +++ b/shell/browser/ui/inspectable_web_contents_view_mac.h @@ -10,10 +10,6 @@ @class ElectronInspectableWebContentsView; -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron { class InspectableWebContentsViewMac : public InspectableWebContentsView { diff --git a/shell/browser/ui/tray_icon_cocoa.h b/shell/browser/ui/tray_icon_cocoa.h index d7a7904571..cf2c4ffb94 100644 --- a/shell/browser/ui/tray_icon_cocoa.h +++ b/shell/browser/ui/tray_icon_cocoa.h @@ -14,10 +14,6 @@ @class ElectronMenuController; @class StatusItemView; -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - namespace electron { class TrayIconCocoa : public TrayIcon { diff --git a/shell/common/application_info_mac.mm b/shell/common/application_info_mac.mm index 7a35873b04..b067bb98b4 100644 --- a/shell/common/application_info_mac.mm +++ b/shell/common/application_info_mac.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by the MIT license that can be // found in the LICENSE file. -#import "shell/common/application_info.h" +#include "shell/common/application_info.h" #include -#import "base/mac/foundation_util.h" -#import "base/strings/sys_string_conversions.h" -#import "shell/common/mac/main_application_bundle.h" +#include "base/mac/foundation_util.h" +#include "base/strings/sys_string_conversions.h" +#include "shell/common/mac/main_application_bundle.h" namespace electron { diff --git a/shell/common/mac/main_application_bundle.mm b/shell/common/mac/main_application_bundle.mm index 774593f5d9..add309ad80 100644 --- a/shell/common/mac/main_application_bundle.mm +++ b/shell/common/mac/main_application_bundle.mm @@ -3,7 +3,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE-CHROMIUM file. -#import "shell/common/mac/main_application_bundle.h" +#include "shell/common/mac/main_application_bundle.h" #include "base/apple/bundle_locations.h" #include "base/files/file_path.h"