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

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

Issue 2610923005: Replace ObjCPropertyReleaser with ReleaseProperties() project-wide. (Closed)
Patch Set: weak -> assign 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
Index: ios/chrome/browser/ui/history/history_collection_view_controller.mm
diff --git a/ios/chrome/browser/ui/history/history_collection_view_controller.mm b/ios/chrome/browser/ui/history/history_collection_view_controller.mm
index b394babfd2cc973ee1b678c8312ec498cfa53a59..c2df91c28819a75250d450b08d6fdc69f204ff5b 100644
--- a/ios/chrome/browser/ui/history/history_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/history/history_collection_view_controller.mm
@@ -10,7 +10,7 @@
#import "base/ios/weak_nsobject.h"
#include "base/mac/foundation_util.h"
-#import "base/mac/objc_property_releaser.h"
+#include "base/mac/objc_release_properties.h"
#include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
@@ -64,8 +64,6 @@ const CGFloat kSeparatorInset = 10;
HistoryEntryInserterDelegate,
HistoryEntryItemDelegate,
HistoryServiceFacadeDelegate> {
- base::mac::ObjCPropertyReleaser
- _propertyReleaser_HistoryCollectionViewController;
// Facade for communicating with HistoryService and WebHistoryService.
std::unique_ptr<HistoryServiceFacade> _historyServiceFacade;
// The main browser state. Not owned by HistoryCollectionViewController.
@@ -149,8 +147,6 @@ const CGFloat kSeparatorInset = 10;
delegate {
self = [super initWithStyle:CollectionViewControllerStyleDefault];
if (self) {
- _propertyReleaser_HistoryCollectionViewController.Init(
- self, [HistoryCollectionViewController class]);
_historyServiceFacade.reset(new HistoryServiceFacade(browserState, self));
_browserState = browserState;
_delegate.reset(delegate);
@@ -168,6 +164,11 @@ const CGFloat kSeparatorInset = 10;
return self;
}
+- (void)dealloc {
+ base::mac::ReleaseProperties(self);
+ [super dealloc];
+}
+
- (void)viewDidLoad {
[super viewDidLoad];
self.styler.cellLayoutType = MDCCollectionViewCellLayoutTypeList;

Powered by Google App Engine
This is Rietveld 408576698