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

Unified Diff: ios/chrome/browser/ui/settings/dataplan_usage_collection_view_controller.mm

Issue 2814813003: [ObjC ARC] Converts ios/chrome/browser/ui/settings:settings_arc_transition to ARC. (Closed)
Patch Set: rebase 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
Index: ios/chrome/browser/ui/settings/dataplan_usage_collection_view_controller.mm
diff --git a/ios/chrome/browser/ui/settings/dataplan_usage_collection_view_controller.mm b/ios/chrome/browser/ui/settings/dataplan_usage_collection_view_controller.mm
index b79607afefecd064d41a18ef5991642aa7c8dcc6..f46e458eb19f3fffbf73644f612febdd3f88f1e7 100644
--- a/ios/chrome/browser/ui/settings/dataplan_usage_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/dataplan_usage_collection_view_controller.mm
@@ -6,7 +6,6 @@
#include "base/logging.h"
#import "base/mac/foundation_util.h"
-#import "base/mac/scoped_nsobject.h"
#include "components/prefs/pref_member.h"
#include "components/prefs/pref_service.h"
#import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h"
@@ -16,6 +15,10 @@
#include "ui/base/l10n/l10n_util.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 {
typedef NS_ENUM(NSInteger, SectionIdentifier) {
@@ -71,20 +74,20 @@ typedef NS_ENUM(NSInteger, ItemType) {
[model addSectionWithIdentifier:SectionIdentifierOptions];
- base::scoped_nsobject<CollectionViewTextItem> always(
- [[CollectionViewTextItem alloc] initWithType:ItemTypeOptionsAlways]);
+ CollectionViewTextItem* always =
+ [[CollectionViewTextItem alloc] initWithType:ItemTypeOptionsAlways];
[always setText:l10n_util::GetNSString(IDS_IOS_OPTIONS_DATA_USAGE_ALWAYS)];
[always setAccessibilityTraits:UIAccessibilityTraitButton];
[model addItem:always toSectionWithIdentifier:SectionIdentifierOptions];
- base::scoped_nsobject<CollectionViewTextItem> wifi(
- [[CollectionViewTextItem alloc] initWithType:ItemTypeOptionsOnlyOnWiFi]);
+ CollectionViewTextItem* wifi =
+ [[CollectionViewTextItem alloc] initWithType:ItemTypeOptionsOnlyOnWiFi];
[wifi setText:l10n_util::GetNSString(IDS_IOS_OPTIONS_DATA_USAGE_ONLY_WIFI)];
[wifi setAccessibilityTraits:UIAccessibilityTraitButton];
[model addItem:wifi toSectionWithIdentifier:SectionIdentifierOptions];
- base::scoped_nsobject<CollectionViewTextItem> never(
- [[CollectionViewTextItem alloc] initWithType:ItemTypeOptionsNever]);
+ CollectionViewTextItem* never =
+ [[CollectionViewTextItem alloc] initWithType:ItemTypeOptionsNever];
[never setText:l10n_util::GetNSString(IDS_IOS_OPTIONS_DATA_USAGE_NEVER)];
[never setAccessibilityTraits:UIAccessibilityTraitButton];
[model addItem:never toSectionWithIdentifier:SectionIdentifierOptions];

Powered by Google App Engine
This is Rietveld 408576698