| Index: ios/chrome/browser/ui/settings/about_chrome_collection_view_controller.mm
|
| diff --git a/ios/chrome/browser/ui/settings/about_chrome_collection_view_controller.mm b/ios/chrome/browser/ui/settings/about_chrome_collection_view_controller.mm
|
| index 11b6ff8e8cb6da504710c9828adfcdfc52473e3d..740243f46117cd13371a52607f5eba3870f6ba79 100644
|
| --- a/ios/chrome/browser/ui/settings/about_chrome_collection_view_controller.mm
|
| +++ b/ios/chrome/browser/ui/settings/about_chrome_collection_view_controller.mm
|
| @@ -7,7 +7,6 @@
|
| #import "base/ios/block_types.h"
|
| #include "base/logging.h"
|
| #import "base/mac/foundation_util.h"
|
| -#import "base/mac/scoped_nsobject.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "components/version_info/version_info.h"
|
| @@ -27,6 +26,10 @@
|
| #include "ui/base/l10n/l10n_util_mac.h"
|
| #include "url/gurl.h"
|
|
|
| +#if !defined(__has_feature) || !__has_feature(objc_arc)
|
| +#error "This file requires ARC support."
|
| +#endif
|
| +
|
| namespace {
|
|
|
| typedef NS_ENUM(NSInteger, SectionIdentifier) {
|
| @@ -64,35 +67,32 @@ typedef NS_ENUM(NSInteger, ItemType) {
|
|
|
| [model addSectionWithIdentifier:SectionIdentifierLinks];
|
|
|
| - base::scoped_nsobject<CollectionViewTextItem> credits(
|
| - [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksCredits]);
|
| - credits.get().text = l10n_util::GetNSString(IDS_IOS_OPEN_SOURCE_LICENSES);
|
| - credits.get().accessoryType =
|
| - MDCCollectionViewCellAccessoryDisclosureIndicator;
|
| - credits.get().accessibilityTraits = UIAccessibilityTraitButton;
|
| + CollectionViewTextItem* credits =
|
| + [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksCredits];
|
| + credits.text = l10n_util::GetNSString(IDS_IOS_OPEN_SOURCE_LICENSES);
|
| + credits.accessoryType = MDCCollectionViewCellAccessoryDisclosureIndicator;
|
| + credits.accessibilityTraits = UIAccessibilityTraitButton;
|
| [model addItem:credits toSectionWithIdentifier:SectionIdentifierLinks];
|
|
|
| - base::scoped_nsobject<CollectionViewTextItem> terms(
|
| - [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksTerms]);
|
| - terms.get().text = l10n_util::GetNSString(IDS_IOS_TERMS_OF_SERVICE);
|
| - terms.get().accessoryType = MDCCollectionViewCellAccessoryDisclosureIndicator;
|
| - terms.get().accessibilityTraits = UIAccessibilityTraitButton;
|
| + CollectionViewTextItem* terms =
|
| + [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksTerms];
|
| + terms.text = l10n_util::GetNSString(IDS_IOS_TERMS_OF_SERVICE);
|
| + terms.accessoryType = MDCCollectionViewCellAccessoryDisclosureIndicator;
|
| + terms.accessibilityTraits = UIAccessibilityTraitButton;
|
| [model addItem:terms toSectionWithIdentifier:SectionIdentifierLinks];
|
|
|
| - base::scoped_nsobject<CollectionViewTextItem> privacy(
|
| - [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksPrivacy]);
|
| - privacy.get().text = l10n_util::GetNSString(IDS_IOS_PRIVACY_POLICY);
|
| - privacy.get().accessoryType =
|
| - MDCCollectionViewCellAccessoryDisclosureIndicator;
|
| - privacy.get().accessibilityTraits = UIAccessibilityTraitButton;
|
| + CollectionViewTextItem* privacy =
|
| + [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksPrivacy];
|
| + privacy.text = l10n_util::GetNSString(IDS_IOS_PRIVACY_POLICY);
|
| + privacy.accessoryType = MDCCollectionViewCellAccessoryDisclosureIndicator;
|
| + privacy.accessibilityTraits = UIAccessibilityTraitButton;
|
| [model addItem:privacy toSectionWithIdentifier:SectionIdentifierLinks];
|
|
|
| [model addSectionWithIdentifier:SectionIdentifierFooter];
|
|
|
| - base::scoped_nsobject<VersionItem> version(
|
| - [[VersionItem alloc] initWithType:ItemTypeVersion]);
|
| - version.get().text = [self versionDescriptionString];
|
| - version.get().accessibilityTraits = UIAccessibilityTraitButton;
|
| + VersionItem* version = [[VersionItem alloc] initWithType:ItemTypeVersion];
|
| + version.text = [self versionDescriptionString];
|
| + version.accessibilityTraits = UIAccessibilityTraitButton;
|
| [model addItem:version toSectionWithIdentifier:SectionIdentifierFooter];
|
| }
|
|
|
|
|