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

Unified Diff: ios/chrome/browser/ui/history/favicon_view.mm

Issue 2624963003: [ObjC ARC] Converts ios/chrome/browser/ui/history:history to ARC. (Closed)
Patch Set: Removes the rest of weak and scoped nsobjects. Created 3 years, 11 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/history/favicon_view.h ('k') | ios/chrome/browser/ui/history/favicon_view_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/history/favicon_view.mm
diff --git a/ios/chrome/browser/ui/history/favicon_view.mm b/ios/chrome/browser/ui/history/favicon_view.mm
index bef1d0ef5f5b5ba983694017655961dacc70b877..e2958ebb7a7ec0b0438231eab1945c8b461169de 100644
--- a/ios/chrome/browser/ui/history/favicon_view.mm
+++ b/ios/chrome/browser/ui/history/favicon_view.mm
@@ -4,9 +4,12 @@
#import "ios/chrome/browser/ui/history/favicon_view.h"
-#include "base/mac/objc_property_releaser.h"
#import "ios/chrome/browser/ui/uikit_ui_util.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
namespace {
// Default corner radius for the favicon image view.
const CGFloat kDefaultCornerRadius = 3;
@@ -14,7 +17,6 @@ const CGFloat kDefaultCornerRadius = 3;
@interface FaviconView () {
// Property releaser for FaviconView.
- base::mac::ObjCPropertyReleaser _propertyReleaser_FaviconView;
}
// Size constraints for the favicon views.
@property(nonatomic, copy) NSArray* faviconSizeConstraints;
@@ -30,7 +32,6 @@ const CGFloat kDefaultCornerRadius = 3;
- (instancetype)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
- _propertyReleaser_FaviconView.Init(self, [FaviconView class]);
_faviconImage = [[UIImageView alloc] init];
_faviconImage.clipsToBounds = YES;
_faviconImage.layer.cornerRadius = kDefaultCornerRadius;
@@ -51,10 +52,10 @@ const CGFloat kDefaultCornerRadius = 3;
AddSameSizeConstraint(_faviconImage, self);
AddSameCenterConstraints(_faviconFallbackLabel, self);
AddSameSizeConstraint(_faviconFallbackLabel, self);
- _faviconSizeConstraints = [@[
+ _faviconSizeConstraints = @[
[self.widthAnchor constraintEqualToConstant:0],
[self.heightAnchor constraintEqualToConstant:0],
- ] retain];
+ ];
[NSLayoutConstraint activateConstraints:_faviconSizeConstraints];
}
return self;
« no previous file with comments | « ios/chrome/browser/ui/history/favicon_view.h ('k') | ios/chrome/browser/ui/history/favicon_view_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698