Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(91)

Unified Diff: ios/chrome/browser/ui/popup_menu/popup_menu_controller.mm

Issue 2935743002: [ObjC ARC] Converts ios/chrome/browser/ui/popup_menu:popup_menu to ARC. (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/popup_menu/popup_menu_controller.mm
diff --git a/ios/chrome/browser/ui/popup_menu/popup_menu_controller.mm b/ios/chrome/browser/ui/popup_menu/popup_menu_controller.mm
index 67844336d01c4c046bc9a25e4611011b1cfdf012..2ae15123ce14d4004a78e35096c3caf69ca63271 100644
--- a/ios/chrome/browser/ui/popup_menu/popup_menu_controller.mm
+++ b/ios/chrome/browser/ui/popup_menu/popup_menu_controller.mm
@@ -4,10 +4,8 @@
#import "ios/chrome/browser/ui/popup_menu/popup_menu_controller.h"
-#import "base/ios/weak_nsobject.h"
#include "base/logging.h"
#include "base/mac/bundle_locations.h"
-#include "base/mac/objc_property_releaser.h"
#import "ios/chrome/browser/ui/animation_util.h"
#import "ios/chrome/browser/ui/popup_menu/popup_menu_view.h"
#include "ios/chrome/browser/ui/rtl_geometry.h"
@@ -16,6 +14,10 @@
#include "ios/chrome/grit/ios_strings.h"
#include "ui/base/l10n/l10n_util.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
using ios::material::TimingFunction;
namespace {
@@ -55,7 +57,6 @@ static CGPoint AnimateInIntermediaryPoint(CGPoint source, CGPoint destination) {
} // anonymous namespace
@interface PopupMenuController ()<PopupMenuViewDelegate> {
- base::mac::ObjCPropertyReleaser propertyReleaser_PopupMenuController_;
CGPoint sourceAnimationPoint_;
}
@end
@@ -85,9 +86,6 @@ static CGPoint AnimateInIntermediaryPoint(CGPoint source, CGPoint destination) {
DCHECK(parent);
self = [super init];
if (self) {
- propertyReleaser_PopupMenuController_.Init(self,
- [PopupMenuController class]);
-
popupContainer_ = [[PopupMenuView alloc]
initWithFrame:CGRectMake(0, 0, kPopupContainerWidth,
kPopupContainerHeight)];
@@ -176,7 +174,6 @@ static CGPoint AnimateInIntermediaryPoint(CGPoint source, CGPoint destination) {
[popupContainer_ removeFromSuperview];
[backgroundButton_ removeFromSuperview];
[containerView_ removeFromSuperview];
- [super dealloc];
}
- (void)tappedBehindPopup:(id)sender {
@@ -244,8 +241,6 @@ static CGPoint AnimateInIntermediaryPoint(CGPoint source, CGPoint destination) {
[CATransaction begin];
[CATransaction setAnimationTimingFunction:easeIn];
[CATransaction setAnimationDuration:ios::material::kDuration2];
-
- base::WeakNSObject<PopupMenuController> weakSelf(self);
[CATransaction setCompletionBlock:^{
if (completion)
completion();
« no previous file with comments | « ios/chrome/browser/ui/popup_menu/popup_menu_controller.h ('k') | ios/chrome/browser/ui/popup_menu/popup_menu_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698