| Index: ios/chrome/browser/ui/bookmarks/bars/bookmark_navigation_bar.mm
|
| diff --git a/ios/chrome/browser/ui/bookmarks/bars/bookmark_navigation_bar.mm b/ios/chrome/browser/ui/bookmarks/bars/bookmark_navigation_bar.mm
|
| index 2c3b19f340a69595a9baf0fb258dda610f635567..f6f4780251f13432f0af58e968a09caaac7849ce 100644
|
| --- a/ios/chrome/browser/ui/bookmarks/bars/bookmark_navigation_bar.mm
|
| +++ b/ios/chrome/browser/ui/bookmarks/bars/bookmark_navigation_bar.mm
|
| @@ -6,7 +6,7 @@
|
|
|
| #import <QuartzCore/QuartzCore.h>
|
|
|
| -#include "base/mac/objc_property_releaser.h"
|
| +#include "base/mac/objc_release_properties.h"
|
| #include "base/mac/scoped_nsobject.h"
|
| #import "ios/chrome/browser/ui/bookmarks/bookmark_extended_button.h"
|
| #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
|
| @@ -27,9 +27,7 @@ const CGFloat kContentHeight = 56;
|
| const CGFloat kInterButtonMargin = 24;
|
| }; // namespace
|
|
|
| -@interface BookmarkNavigationBar () {
|
| - base::mac::ObjCPropertyReleaser _propertyReleaser_BookmarkNavigationBar;
|
| -}
|
| +@interface BookmarkNavigationBar ()
|
| @property(nonatomic, retain) BookmarkExtendedButton* cancelButton;
|
| // All subviews are added to |contentView|, which allows easy repositioning of
|
| // the content to account for iOS 6 and iOS 7+ layout differences.
|
| @@ -51,9 +49,6 @@ const CGFloat kInterButtonMargin = 24;
|
| - (id)initWithFrame:(CGRect)outerFrame {
|
| self = [super initWithFrame:outerFrame];
|
| if (self) {
|
| - _propertyReleaser_BookmarkNavigationBar.Init(self,
|
| - [BookmarkNavigationBar class]);
|
| -
|
| self.backgroundColor = bookmark_utils_ios::mainBackgroundColor();
|
| self.autoresizingMask = UIViewAutoresizingFlexibleBottomMargin |
|
| UIViewAutoresizingFlexibleWidth;
|
| @@ -186,6 +181,11 @@ const CGFloat kInterButtonMargin = 24;
|
| return self;
|
| }
|
|
|
| +- (void)dealloc {
|
| + base::mac::ReleaseProperties(self);
|
| + [super dealloc];
|
| +}
|
| +
|
| - (void)layoutSubviews {
|
| [super layoutSubviews];
|
|
|
|
|