Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: ios/chrome/app/safe_mode/safe_mode_coordinator.mm

Issue 2894003002: [ObjC ARC] Converts ios/chrome/app/safe_mode:safe_mode to ARC. (Closed)
Patch Set: Addressed all comments Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/app/safe_mode/safe_mode_coordinator.mm
diff --git a/ios/chrome/app/safe_mode/safe_mode_coordinator.mm b/ios/chrome/app/safe_mode/safe_mode_coordinator.mm
index a91978506315961044ee12447ef3e2dcae1980bc..30f5765754a497952d10c7373a100ed1fa91df59 100644
--- a/ios/chrome/app/safe_mode/safe_mode_coordinator.mm
+++ b/ios/chrome/app/safe_mode/safe_mode_coordinator.mm
@@ -4,35 +4,27 @@
#import "ios/chrome/app/safe_mode/safe_mode_coordinator.h"
-#include "base/mac/scoped_nsobject.h"
#import "ios/chrome/app/safe_mode/safe_mode_view_controller.h"
#include "ios/chrome/browser/crash_loop_detection_util.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
namespace {
const int kStartupCrashLoopThreshold = 2;
}
@interface SafeModeCoordinator ()<SafeModeViewControllerDelegate> {
- // Weak pointer to window passed on init.
- base::WeakNSObject<UIWindow> _window;
- // Weak pointer backing property of the same name.
- base::WeakNSProtocol<id<SafeModeCoordinatorDelegate>> _delegate;
+ __weak UIWindow* _window;
+ @implementation SafeModeCoordinator
+ @synthesize delegate = _delegate;
rohitrao (ping after 24h) 2017/06/01 17:29:02 This looks like a busted rebase.
}
@end
@implementation SafeModeCoordinator
-#pragma mark - property implementation.
-
-- (id<SafeModeCoordinatorDelegate>)delegate {
- return _delegate;
-}
-
-- (void)setDelegate:(id<SafeModeCoordinatorDelegate>)delegate {
- _delegate.reset(delegate);
-}
-
#pragma mark - Public class methods
+ (BOOL)shouldStart {
@@ -54,8 +46,8 @@ const int kStartupCrashLoopThreshold = 2;
// General note: Safe mode should be safe; it should not depend on other
// objects being created. Be extremely conservative when adding code to this
// method.
- base::scoped_nsobject<SafeModeViewController> viewController(
- [[SafeModeViewController alloc] initWithDelegate:self]);
+ SafeModeViewController* viewController =
+ [[SafeModeViewController alloc] initWithDelegate:self];
[self.window setRootViewController:viewController];
// Reset the crash count; the user may change something based on the recovery
« no previous file with comments | « ios/chrome/app/safe_mode/safe_mode_coordinator.h ('k') | ios/chrome/app/safe_mode/safe_mode_view_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698