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

Unified Diff: ios/chrome/browser/ui/popup_menu/popup_menu_view.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
« no previous file with comments | « ios/chrome/browser/ui/popup_menu/popup_menu_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/popup_menu/popup_menu_view.mm
diff --git a/ios/chrome/browser/ui/popup_menu/popup_menu_view.mm b/ios/chrome/browser/ui/popup_menu/popup_menu_view.mm
index 4115e90cefc02db2aa522e836f5c95ec77ae706b..7b08dcc7bbb67d0cf0a16583981620d6c5072807 100644
--- a/ios/chrome/browser/ui/popup_menu/popup_menu_view.mm
+++ b/ios/chrome/browser/ui/popup_menu/popup_menu_view.mm
@@ -6,7 +6,9 @@
#import <QuartzCore/QuartzCore.h>
-#include "base/mac/scoped_nsobject.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
namespace {
// The image edge insets for popup_background.png.
@@ -16,7 +18,7 @@ NS_INLINE UIEdgeInsets PopupBackgroundInsets() {
};
@implementation PopupMenuView {
- base::scoped_nsobject<UIImageView> imageView_;
+ UIImageView* imageView_;
}
@synthesize delegate = delegate_;
@@ -41,7 +43,7 @@ NS_INLINE UIEdgeInsets PopupBackgroundInsets() {
UIImage* image = [UIImage imageNamed:@"popup_background"];
image = [image resizableImageWithCapInsets:PopupBackgroundInsets()];
- imageView_.reset([[UIImageView alloc] initWithImage:image]);
+ imageView_ = [[UIImageView alloc] initWithImage:image];
[self addSubview:imageView_];
}
« no previous file with comments | « ios/chrome/browser/ui/popup_menu/popup_menu_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698