| Index: ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
|
| diff --git a/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm b/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
|
| index 84adea1713b824939d1baac28267bf0f4fbb3371..8ccaa5d1945f8205043cb8a6c1ac48117f16e535 100644
|
| --- a/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
|
| +++ b/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
|
| @@ -9,7 +9,7 @@
|
| #include "base/ios/ios_util.h"
|
| #import "base/ios/weak_nsobject.h"
|
| #include "base/logging.h"
|
| -#include "base/mac/objc_property_releaser.h"
|
| +#include "base/mac/objc_release_properties.h"
|
| #include "base/mac/scoped_nsobject.h"
|
| #include "base/metrics/field_trial.h"
|
| #include "components/reading_list/core/reading_list_switches.h"
|
| @@ -256,9 +256,7 @@ NS_INLINE void AnimateInViews(NSArray* views,
|
| @property(nonatomic, retain) ToolsMenuButton* toolsButton;
|
| @end
|
|
|
| -@implementation ToolsMenuViewToolsCell {
|
| - base::mac::ObjCPropertyReleaser _propertyReleaser_ToolsMenuViewToolsCell;
|
| -}
|
| +@implementation ToolsMenuViewToolsCell
|
|
|
| @synthesize reloadButton = _reloadButton;
|
| @synthesize shareButton = _shareButton;
|
| @@ -284,9 +282,6 @@ NS_INLINE void AnimateInViews(NSArray* views,
|
| }
|
|
|
| - (void)commonInitialization {
|
| - _propertyReleaser_ToolsMenuViewToolsCell.Init(self,
|
| - [ToolsMenuViewToolsCell class]);
|
| -
|
| [self setBackgroundColor:[UIColor whiteColor]];
|
| [self setOpaque:YES];
|
|
|
| @@ -340,6 +335,11 @@ NS_INLINE void AnimateInViews(NSArray* views,
|
| [self addConstraints];
|
| }
|
|
|
| +- (void)dealloc {
|
| + base::mac::ReleaseProperties(self);
|
| + [super dealloc];
|
| +}
|
| +
|
| - (ToolsMenuButton*)newButtonForImageIds:(int[2][3])imageIds
|
| commandID:(int)commandID
|
| accessibilityLabelID:(int)labelID
|
| @@ -446,7 +446,6 @@ NS_INLINE void AnimateInViews(NSArray* views,
|
| @interface ToolsMenuViewController ()<UICollectionViewDelegateFlowLayout,
|
| UICollectionViewDataSource,
|
| ReadingListMenuNotificationDelegate> {
|
| - base::mac::ObjCPropertyReleaser _propertyReleaser_ToolsMenuViewController;
|
| BOOL _waitForInk;
|
| // Weak pointer to ReadingListMenuNotifier, used to set the starting values
|
| // for the reading list badge.
|
| @@ -667,11 +666,14 @@ NS_INLINE void AnimateInViews(NSArray* views,
|
| }
|
|
|
| - (void)commonInitialization {
|
| - _propertyReleaser_ToolsMenuViewController.Init(
|
| - self, [ToolsMenuViewController class]);
|
| _readingListMenuNotifier.reset();
|
| }
|
|
|
| +- (void)dealloc {
|
| + base::mac::ReleaseProperties(self);
|
| + [super dealloc];
|
| +}
|
| +
|
| - (void)loadView {
|
| [super loadView];
|
|
|
|
|