chore: cleanup arc migration helpers (#39606)

2023-08-23 15:54:21 +02:00 · 2023-08-23 15:54:21 +02:00 · 522bba3dc6
commit 522bba3dc6
parent ddc7e3ebb3
25 changed files with 52 additions and 172 deletions
--- 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 {
--- 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 {
--- 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(
--- 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<v8::Promise> PushNotifications::RegisterForAPNSNotifications(
--- 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 <>
--- 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 {
--- 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_;
--- 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) {
--- a/shell/browser/mac/electron_application.h
+++ b/shell/browser/mac/electron_application.h
@ -11,10 +11,6 @@
 #import <AVFoundation/AVFoundation.h>
 #import <LocalAuthentication/LocalAuthentication.h>

-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
@interface AtomApplication : NSApplication <CrAppProtocol,
                                            CrAppControlProtocol,
                                            NSUserActivityDelegate> {
--- a/shell/browser/mac/electron_application_delegate.mm
+++ b/shell/browser/mac/electron_application_delegate.mm
@ -19,10 +19,6 @@

 #import <UserNotifications/UserNotifications.h>

-#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)] ||
--- 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

--- 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)
--- 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;
 }
--- 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:
--- 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;
 }
--- a/shell/browser/ui/cocoa/electron_ns_window.mm
+++ b/shell/browser/ui/cocoa/electron_ns_window.mm
@ -14,10 +14,6 @@
 #import <objc/message.h>
 #import <objc/runtime.h>

-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
 namespace electron {

 int ScopedDisableResize::disable_resize_ = 0;
--- 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;
--- 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 <NSScrubberDelegate,
                                        NSScrubberDataSource,
                                        NSScrubberFlowLayoutDelegate> {
--- 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 {
--- 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 {
--- 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 <string>

-#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 {

--- 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"