| 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..cd482c3a289464dd7cfab100318b61bea5ac7f6f 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,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/mac/bundle_locations.h"
|
| -#include "base/mac/objc_property_releaser.h"
|
| +#include "base/mac/objc_release_properties.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"
|
| @@ -38,22 +38,16 @@ CGFloat kHistoryPopupYOffset = 3;
|
| static const CGFloat kHeightPercentage = 0.85;
|
| } // anonymous namespace
|
|
|
| -@interface TabHistoryPopupController () {
|
| - // TableViewController for the table displaying tab history entries.
|
| - TabHistoryViewController* tabHistoryTableViewController_;
|
| -
|
| - // Container view of the history entries table.
|
| - UIView* tabHistoryTableViewContainer_;
|
| -
|
| - base::mac::ObjCPropertyReleaser propertyReleaser_TabHistoryPopupController_;
|
| -}
|
| +@interface TabHistoryPopupController ()
|
|
|
| // Determines the width for the popup depending on the device, orientation, and
|
| // CRWSessionEntrys to display.
|
| - (CGFloat)calculatePopupWidth:(NSArray*)entries;
|
|
|
| +// TableViewController for the table displaying tab history entries.
|
| @property(nonatomic, retain)
|
| TabHistoryViewController* tabHistoryTableViewController;
|
| +// Container view of the history entries table.
|
| @property(nonatomic, retain) UIView* tabHistoryTableViewContainer;
|
|
|
| @end
|
| @@ -69,9 +63,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,6 +159,7 @@ static const CGFloat kHeightPercentage = 0.85;
|
|
|
| - (void)dealloc {
|
| [tabHistoryTableViewContainer_ removeFromSuperview];
|
| + base::mac::ReleaseProperties(self);
|
| [super dealloc];
|
| }
|
|
|
|
|