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

Unified Diff: ios/chrome/browser/ui/bookmarks/bookmark_folder_collection_view.mm

Issue 2738053008: Revert of [ObjC ARC] Converts ios/chrome/browser/ui/bookmarks:bookmarks_arc_2 to ARC. (Closed)
Patch Set: Created 3 years, 9 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/bookmarks/bookmark_folder_collection_view.mm
diff --git a/ios/chrome/browser/ui/bookmarks/bookmark_folder_collection_view.mm b/ios/chrome/browser/ui/bookmarks/bookmark_folder_collection_view.mm
index 4b2a16a4b81bd8dc1d8021e97856d84a8203b35a..ffcbd4f05b0a588b59fa8ec938ed33513e3db595 100644
--- a/ios/chrome/browser/ui/bookmarks/bookmark_folder_collection_view.mm
+++ b/ios/chrome/browser/ui/bookmarks/bookmark_folder_collection_view.mm
@@ -5,6 +5,7 @@
#import "ios/chrome/browser/ui/bookmarks/bookmark_folder_collection_view.h"
#include "base/logging.h"
+#include "base/mac/objc_property_releaser.h"
#include "base/strings/sys_string_conversions.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "ios/chrome/browser/bookmarks/bookmarks_utils.h"
@@ -13,13 +14,11 @@
#import "ios/chrome/browser/ui/bookmarks/bookmark_promo_cell.h"
#import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
using bookmarks::BookmarkNode;
@interface BookmarkFolderCollectionView ()<BookmarkPromoCellDelegate> {
+ base::mac::ObjCPropertyReleaser
+ _propertyReleaser_BookmarkFolderCollectionView;
// A vector of folders to display in the collection view.
std::vector<const BookmarkNode*> _subFolders;
// A vector of bookmark urls to display in the collection view.
@@ -37,7 +36,7 @@
@property(nonatomic, readonly, assign) NSInteger sectionCount;
// Keep a reference to the promo cell to deregister as delegate.
-@property(nonatomic, strong) BookmarkPromoCell* promoCell;
+@property(nonatomic, retain) BookmarkPromoCell* promoCell;
@end
@@ -50,6 +49,9 @@
frame:(CGRect)frame {
self = [super initWithBrowserState:browserState frame:frame];
if (self) {
+ _propertyReleaser_BookmarkFolderCollectionView.Init(
+ self, [BookmarkFolderCollectionView class]);
+
[self updateCollectionView];
}
return self;
@@ -57,6 +59,7 @@
- (void)dealloc {
_promoCell.delegate = nil;
+ [super dealloc];
}
- (void)setDelegate:(id<BookmarkFolderCollectionViewDelegate>)delegate {

Powered by Google App Engine
This is Rietveld 408576698