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/icons/chrome_icon.mm

Issue 2830033004: [ObjC ARC] Converts ios/chrome/browser/ui/icons:icons to ARC. (Closed)
Patch Set: Fix autorelease Created 3 years, 8 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/icons/BUILD.gn ('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/icons/chrome_icon.mm
diff --git a/ios/chrome/browser/ui/icons/chrome_icon.mm b/ios/chrome/browser/ui/icons/chrome_icon.mm
index 822247cbd21c0787d454766c027136d517f2e72e..8682485c2165a85693823f12a693e5ecefeba9fc 100644
--- a/ios/chrome/browser/ui/icons/chrome_icon.mm
+++ b/ios/chrome/browser/ui/icons/chrome_icon.mm
@@ -7,10 +7,13 @@
#import <CoreGraphics/CoreGraphics.h>
#include "base/logging.h"
-#import "base/mac/scoped_nsobject.h"
#include "ios/chrome/grit/ios_strings.h"
#include "ui/base/l10n/l10n_util_mac.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
namespace {
NSString* AccessibilityLabelForIconNamed(NSString* name) {
@@ -73,14 +76,14 @@ UIImage* ImageFlippedForRightToLeftLayoutDirection(UIImage* image) {
action:(SEL)action {
UIImage* templateImage =
[image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
- base::scoped_nsobject<UIBarButtonItem> barButtonItem([[UIBarButtonItem alloc]
- initWithImage:templateImage
- style:UIBarButtonItemStylePlain
- target:target
- action:action]);
+ UIBarButtonItem* barButtonItem =
+ [[UIBarButtonItem alloc] initWithImage:templateImage
+ style:UIBarButtonItemStylePlain
+ target:target
+ action:action];
[barButtonItem setAccessibilityIdentifier:image.accessibilityIdentifier];
[barButtonItem setAccessibilityLabel:image.accessibilityLabel];
- return barButtonItem.autorelease();
+ return barButtonItem;
}
@end
« no previous file with comments | « ios/chrome/browser/ui/icons/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698