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

Unified Diff: ios/chrome/browser/ui/main/main_coordinator.mm

Issue 2886043003: [ObjC ARC] Converts ios/chrome/browser/ui/main:main to ARC. (Closed)
Patch Set: comments Created 3 years, 6 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
« no previous file with comments | « ios/chrome/browser/ui/main/main_coordinator.h ('k') | ios/chrome/browser/ui/main/main_view_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/main/main_coordinator.mm
diff --git a/ios/chrome/browser/ui/main/main_coordinator.mm b/ios/chrome/browser/ui/main/main_coordinator.mm
index 707ae38a2e8c7445457343115d8d17eabd0e7675..34e986814fb82fc050aabf3d61838606264c44b3 100644
--- a/ios/chrome/browser/ui/main/main_coordinator.mm
+++ b/ios/chrome/browser/ui/main/main_coordinator.mm
@@ -4,14 +4,16 @@
#import "ios/chrome/browser/ui/main/main_coordinator.h"
-#include "base/ios/weak_nsobject.h"
-#include "base/mac/scoped_nsobject.h"
#import "ios/chrome/browser/ui/main/main_view_controller.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
@interface MainCoordinator () {
// Instance variables backing properties of the same name.
// |_mainViewController| will be owned by |self.window|.
- base::WeakNSObject<MainViewController> _mainViewController;
+ __weak MainViewController* _mainViewController;
}
@end
@@ -27,9 +29,8 @@
#pragma mark - ChromeCoordinator implementation.
- (void)start {
- base::scoped_nsobject<MainViewController> mainViewController(
- [[MainViewController alloc] init]);
- _mainViewController.reset(mainViewController);
+ MainViewController* mainViewController = [[MainViewController alloc] init];
+ _mainViewController = mainViewController;
self.window.rootViewController = self.mainViewController;
// Size the main view controller to fit the whole screen.
« no previous file with comments | « ios/chrome/browser/ui/main/main_coordinator.h ('k') | ios/chrome/browser/ui/main/main_view_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698