Index: ios/chrome/browser/ui/history/tab_history_popup_controller.mm |
diff --git a/ios/chrome/browser/ui/history/tab_history_popup_controller.mm b/ios/chrome/browser/ui/history/tab_history_popup_controller.mm |
index ca1d9623e56d62078d2f121ca6f4f9afdafd4c9d..832de03afada7c2b7e8a4fcdb927d90f924e01d3 100644 |
--- a/ios/chrome/browser/ui/history/tab_history_popup_controller.mm |
+++ b/ios/chrome/browser/ui/history/tab_history_popup_controller.mm |
@@ -8,7 +8,6 @@ |
#include "base/logging.h" |
#include "base/mac/bundle_locations.h" |
-#include "base/mac/objc_property_releaser.h" |
#include "base/strings/sys_string_conversions.h" |
#import "ios/chrome/browser/ui/history/tab_history_view_controller.h" |
#import "ios/chrome/browser/ui/popup_menu/popup_menu_view.h" |
@@ -21,6 +20,10 @@ |
#import "ui/gfx/ios/NSString+CrStringDrawing.h" |
#include "ui/gfx/ios/uikit_util.h" |
+#if !defined(__has_feature) || !__has_feature(objc_arc) |
+#error "This file requires ARC support." |
+#endif |
+ |
namespace { |
static const CGFloat kTabHistoryMinWidth = 250.0; |
static const CGFloat kTabHistoryMaxWidthLandscapePhone = 350.0; |
@@ -44,17 +47,15 @@ static const CGFloat kHeightPercentage = 0.85; |
// Container view of the history entries table. |
UIView* tabHistoryTableViewContainer_; |
- |
- base::mac::ObjCPropertyReleaser propertyReleaser_TabHistoryPopupController_; |
} |
// Determines the width for the popup depending on the device, orientation, and |
// CRWSessionEntrys to display. |
- (CGFloat)calculatePopupWidth:(NSArray*)entries; |
-@property(nonatomic, retain) |
+@property(nonatomic, strong) |
TabHistoryViewController* tabHistoryTableViewController; |
-@property(nonatomic, retain) UIView* tabHistoryTableViewContainer; |
+@property(nonatomic, strong) UIView* tabHistoryTableViewContainer; |
@end |
@@ -69,9 +70,6 @@ static const CGFloat kHeightPercentage = 0.85; |
DCHECK(parent); |
self = [super initWithParentView:parent]; |
if (self) { |
- propertyReleaser_TabHistoryPopupController_.Init( |
- self, [TabHistoryPopupController class]); |
- |
tabHistoryTableViewController_ = [[TabHistoryViewController alloc] init]; |
[tabHistoryTableViewController_ setSessionEntries:entries]; |
@@ -168,7 +166,6 @@ static const CGFloat kHeightPercentage = 0.85; |
- (void)dealloc { |
[tabHistoryTableViewContainer_ removeFromSuperview]; |
- [super dealloc]; |
} |
@end |