Chromium Code Reviews| Index: ios/chrome/browser/ui/bookmarks/bars/bookmark_top_bar.mm |
| diff --git a/ios/chrome/browser/ui/bookmarks/bars/bookmark_top_bar.mm b/ios/chrome/browser/ui/bookmarks/bars/bookmark_top_bar.mm |
| index 3aaa4ad404c7641b5a477529877aa8f341340bfa..351350fa597376b29c14ed44f9799000eccf8149 100644 |
| --- a/ios/chrome/browser/ui/bookmarks/bars/bookmark_top_bar.mm |
| +++ b/ios/chrome/browser/ui/bookmarks/bars/bookmark_top_bar.mm |
| @@ -3,14 +3,9 @@ |
| // found in the LICENSE file. |
| #import "ios/chrome/browser/ui/bookmarks/bars/bookmark_top_bar.h" |
| -#include "base/mac/objc_property_releaser.h" |
| -#include "base/mac/scoped_nsobject.h" |
| - |
| -@interface BookmarkTopBar () { |
| - base::mac::ObjCPropertyReleaser _propertyReleaser_BookmarkBar; |
| -} |
| -@property(nonatomic, retain) UIView* contentView; |
| -@end |
| +#if !defined(__has_feature) || !__has_feature(objc_arc) |
| +#error "This file requires ARC support." |
| +#endif |
| @implementation BookmarkTopBar |
| @@ -23,15 +18,13 @@ |
| - (instancetype)initWithFrame:(CGRect)frame { |
| self = [super initWithFrame:frame]; |
| if (self) { |
| - _propertyReleaser_BookmarkBar.Init(self, [BookmarkTopBar class]); |
| - |
| self.autoresizingMask = UIViewAutoresizingFlexibleBottomMargin | |
| UIViewAutoresizingFlexibleWidth; |
| - base::scoped_nsobject<UIView> contentView([[UIView alloc] init]); |
| + UIView* contentView = [[UIView alloc] init]; |
|
lpromero
2017/03/10 15:45:14
Use _contentView here. See below.
stkhapugin
2017/04/10 13:51:06
Done.
|
| self.contentView.backgroundColor = [UIColor clearColor]; |
|
lpromero
2017/03/10 15:45:15
This is a bug, as self.contentView is nil here. Yo
stkhapugin
2017/04/10 13:51:06
Done.
|
| [self addSubview:contentView]; |
| - self.contentView = contentView; |
| + _contentView = contentView; |
| [self statelessLayoutContentView]; |
| } |