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

Unified Diff: ios/chrome/browser/chrome_coordinator.mm

Issue 2566993002: [ObjC ARC] Converts ios/chrome/browser:browser to ARC. (Closed)
Patch Set: comments Created 4 years 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
« no previous file with comments | « ios/chrome/browser/chrome_coordinator.h ('k') | ios/chrome/browser/chrome_paths.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/chrome_coordinator.mm
diff --git a/ios/chrome/browser/chrome_coordinator.mm b/ios/chrome/browser/chrome_coordinator.mm
index a5eced205bd6125c75a5a2f7316f4d837621838d..18f2c65a5e0790054c4f536c48d78ea1878b5f1a 100644
--- a/ios/chrome/browser/chrome_coordinator.mm
+++ b/ios/chrome/browser/chrome_coordinator.mm
@@ -4,13 +4,15 @@
#import "ios/chrome/browser/chrome_coordinator.h"
-#include "base/ios/weak_nsobject.h"
#include "base/logging.h"
-#import "base/mac/scoped_nsobject.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
@interface ChromeCoordinator () {
- base::WeakNSObject<UIViewController> _baseViewController;
- base::scoped_nsobject<MutableCoordinatorArray> _childCoordinators;
+ __weak UIViewController* _baseViewController;
+ MutableCoordinatorArray* _childCoordinators;
}
@end
@@ -19,8 +21,8 @@
- (nullable instancetype)initWithBaseViewController:
(UIViewController*)viewController {
if (self = [super init]) {
- _baseViewController.reset(viewController);
- _childCoordinators.reset([[MutableCoordinatorArray array] retain]);
+ _baseViewController = viewController;
+ _childCoordinators = [MutableCoordinatorArray array];
}
return self;
}
@@ -32,7 +34,6 @@
- (void)dealloc {
[self stop];
- [super dealloc];
}
- (MutableCoordinatorArray*)childCoordinators {
« no previous file with comments | « ios/chrome/browser/chrome_coordinator.h ('k') | ios/chrome/browser/chrome_paths.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698