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

Unified Diff: ios/chrome/browser/ui/settings/bar_button_activity_indicator.mm

Issue 2815513008: [ObjC ARC] Converts ios/chrome/browser/ui/settings:settings_arc to ARC. (Closed)
Patch Set: Removes accidental retain from another CL Created 3 years, 8 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/browser/ui/settings/bar_button_activity_indicator.mm
diff --git a/ios/chrome/browser/ui/settings/bar_button_activity_indicator.mm b/ios/chrome/browser/ui/settings/bar_button_activity_indicator.mm
index 5586ac5e2c041add2754f30559115d43b50bbd53..0f4734d78a4f8223eb5c880dc69fe7956c0e25a9 100644
--- a/ios/chrome/browser/ui/settings/bar_button_activity_indicator.mm
+++ b/ios/chrome/browser/ui/settings/bar_button_activity_indicator.mm
@@ -4,18 +4,21 @@
#import "ios/chrome/browser/ui/settings/bar_button_activity_indicator.h"
-#import "base/mac/scoped_nsobject.h"
#include "ios/chrome/browser/ui/ui_util.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
@implementation BarButtonActivityIndicator {
- base::scoped_nsobject<UIActivityIndicatorView> activityIndicator_;
+ UIActivityIndicatorView* activityIndicator_;
}
- (id)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
- activityIndicator_.reset([[UIActivityIndicatorView alloc]
- initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]);
+ activityIndicator_ = [[UIActivityIndicatorView alloc]
+ initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
[activityIndicator_ setBackgroundColor:[UIColor clearColor]];
[activityIndicator_ setHidesWhenStopped:YES];
[activityIndicator_ startAnimating];
@@ -26,7 +29,6 @@
- (void)dealloc {
[activityIndicator_ stopAnimating];
- [super dealloc];
}
- (void)layoutSubviews {

Powered by Google App Engine
This is Rietveld 408576698