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

Unified Diff: ios/chrome/browser/native_app_launcher/native_app_infobar_controller.mm

Issue 2949103008: [ObjC ARC] Converts ios/chrome/browser/native_app_launcher:native_app_launcher to ARC. (Closed)
Patch Set: missing weak 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/native_app_launcher/native_app_infobar_controller.mm
diff --git a/ios/chrome/browser/native_app_launcher/native_app_infobar_controller.mm b/ios/chrome/browser/native_app_launcher/native_app_infobar_controller.mm
index 8d3a553c8e06f2994051f487dc1cba33079bc69c..ae68f8c66d69483602c979fba1445a22ece9a7c8 100644
--- a/ios/chrome/browser/native_app_launcher/native_app_infobar_controller.mm
+++ b/ios/chrome/browser/native_app_launcher/native_app_infobar_controller.mm
@@ -5,7 +5,6 @@
#import "ios/chrome/browser/native_app_launcher/native_app_infobar_controller.h"
#include "base/logging.h"
-#include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
#include "ios/chrome/browser/native_app_launcher/native_app_infobar_delegate.h"
#import "ios/chrome/browser/ui/infobars/infobar_view.h"
@@ -14,6 +13,10 @@
#import "ios/public/provider/chrome/browser/native_app_launcher/native_app_types.h"
#include "ui/base/l10n/l10n_util.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
@interface NativeAppInfoBarController ()
// Action for any of the user defined buttons.
@@ -36,11 +39,11 @@
- (InfoBarView*)viewForDelegate:(infobars::InfoBarDelegate*)delegate
frame:(CGRect)frame {
- base::scoped_nsobject<InfoBarView> infoBarView;
+ InfoBarView* infoBarView;
nativeAppInfoBarDelegate_ = static_cast<NativeAppInfoBarDelegate*>(delegate);
DCHECK(nativeAppInfoBarDelegate_);
- infoBarView.reset(
- [[InfoBarView alloc] initWithFrame:frame delegate:self.delegate]);
+ infoBarView =
+ [[InfoBarView alloc] initWithFrame:frame delegate:self.delegate];
// Lays out widgets common to all NativeAppInfobars.
[infoBarView
@@ -96,7 +99,7 @@
break;
}
}
- return [[infoBarView retain] autorelease];
+ return infoBarView;
}
- (void)infoBarButtonDidPress:(UIButton*)button {

Powered by Google App Engine
This is Rietveld 408576698