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

Side by Side Diff: ios/chrome/browser/ui/settings/about_chrome_collection_view_controller.mm

Issue 2815513008: [ObjC ARC] Converts ios/chrome/browser/ui/settings:settings_arc to ARC. (Closed)
Patch Set: Removes accidental retain from another CL 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/chrome/browser/ui/settings/about_chrome_collection_view_controller. h" 5 #import "ios/chrome/browser/ui/settings/about_chrome_collection_view_controller. h"
6 6
7 #import "base/ios/block_types.h" 7 #import "base/ios/block_types.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #import "base/mac/foundation_util.h" 9 #import "base/mac/foundation_util.h"
10 #import "base/mac/scoped_nsobject.h"
11 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
12 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
13 #include "components/version_info/version_info.h" 12 #include "components/version_info/version_info.h"
14 #include "ios/chrome/browser/chrome_url_constants.h" 13 #include "ios/chrome/browser/chrome_url_constants.h"
15 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h" 14 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
16 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h " 15 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h "
17 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h" 16 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
18 #import "ios/chrome/browser/ui/settings/cells/version_item.h" 17 #import "ios/chrome/browser/ui/settings/cells/version_item.h"
19 #import "ios/chrome/browser/ui/settings/settings_utils.h" 18 #import "ios/chrome/browser/ui/settings/settings_utils.h"
20 #include "ios/chrome/browser/ui/uikit_ui_util.h" 19 #include "ios/chrome/browser/ui/uikit_ui_util.h"
21 #include "ios/chrome/common/channel_info.h" 20 #include "ios/chrome/common/channel_info.h"
22 #include "ios/chrome/grit/ios_chromium_strings.h" 21 #include "ios/chrome/grit/ios_chromium_strings.h"
23 #include "ios/chrome/grit/ios_strings.h" 22 #include "ios/chrome/grit/ios_strings.h"
24 #import "ios/third_party/material_components_ios/src/components/CollectionCells/ src/MaterialCollectionCells.h" 23 #import "ios/third_party/material_components_ios/src/components/CollectionCells/ src/MaterialCollectionCells.h"
25 #import "ios/third_party/material_components_ios/src/components/Snackbar/src/Mat erialSnackbar.h" 24 #import "ios/third_party/material_components_ios/src/components/Snackbar/src/Mat erialSnackbar.h"
26 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/base/l10n/l10n_util_mac.h" 26 #include "ui/base/l10n/l10n_util_mac.h"
28 #include "url/gurl.h" 27 #include "url/gurl.h"
29 28
29 #if !defined(__has_feature) || !__has_feature(objc_arc)
30 #error "This file requires ARC support."
31 #endif
32
30 namespace { 33 namespace {
31 34
32 typedef NS_ENUM(NSInteger, SectionIdentifier) { 35 typedef NS_ENUM(NSInteger, SectionIdentifier) {
33 SectionIdentifierLinks = kSectionIdentifierEnumZero, 36 SectionIdentifierLinks = kSectionIdentifierEnumZero,
34 SectionIdentifierFooter, 37 SectionIdentifierFooter,
35 }; 38 };
36 39
37 typedef NS_ENUM(NSInteger, ItemType) { 40 typedef NS_ENUM(NSInteger, ItemType) {
38 ItemTypeLinksCredits = kItemTypeEnumZero, 41 ItemTypeLinksCredits = kItemTypeEnumZero,
39 ItemTypeLinksTerms, 42 ItemTypeLinksTerms,
(...skipping 17 matching lines...) Expand all
57 } 60 }
58 61
59 #pragma mark SettingsRootCollectionViewController 62 #pragma mark SettingsRootCollectionViewController
60 63
61 - (void)loadModel { 64 - (void)loadModel {
62 [super loadModel]; 65 [super loadModel];
63 CollectionViewModel* model = self.collectionViewModel; 66 CollectionViewModel* model = self.collectionViewModel;
64 67
65 [model addSectionWithIdentifier:SectionIdentifierLinks]; 68 [model addSectionWithIdentifier:SectionIdentifierLinks];
66 69
67 base::scoped_nsobject<CollectionViewTextItem> credits( 70 CollectionViewTextItem* credits =
68 [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksCredits]); 71 [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksCredits];
69 credits.get().text = l10n_util::GetNSString(IDS_IOS_OPEN_SOURCE_LICENSES); 72 credits.text = l10n_util::GetNSString(IDS_IOS_OPEN_SOURCE_LICENSES);
70 credits.get().accessoryType = 73 credits.accessoryType = MDCCollectionViewCellAccessoryDisclosureIndicator;
71 MDCCollectionViewCellAccessoryDisclosureIndicator; 74 credits.accessibilityTraits = UIAccessibilityTraitButton;
72 credits.get().accessibilityTraits = UIAccessibilityTraitButton;
73 [model addItem:credits toSectionWithIdentifier:SectionIdentifierLinks]; 75 [model addItem:credits toSectionWithIdentifier:SectionIdentifierLinks];
74 76
75 base::scoped_nsobject<CollectionViewTextItem> terms( 77 CollectionViewTextItem* terms =
76 [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksTerms]); 78 [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksTerms];
77 terms.get().text = l10n_util::GetNSString(IDS_IOS_TERMS_OF_SERVICE); 79 terms.text = l10n_util::GetNSString(IDS_IOS_TERMS_OF_SERVICE);
78 terms.get().accessoryType = MDCCollectionViewCellAccessoryDisclosureIndicator; 80 terms.accessoryType = MDCCollectionViewCellAccessoryDisclosureIndicator;
79 terms.get().accessibilityTraits = UIAccessibilityTraitButton; 81 terms.accessibilityTraits = UIAccessibilityTraitButton;
80 [model addItem:terms toSectionWithIdentifier:SectionIdentifierLinks]; 82 [model addItem:terms toSectionWithIdentifier:SectionIdentifierLinks];
81 83
82 base::scoped_nsobject<CollectionViewTextItem> privacy( 84 CollectionViewTextItem* privacy =
83 [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksPrivacy]); 85 [[CollectionViewTextItem alloc] initWithType:ItemTypeLinksPrivacy];
84 privacy.get().text = l10n_util::GetNSString(IDS_IOS_PRIVACY_POLICY); 86 privacy.text = l10n_util::GetNSString(IDS_IOS_PRIVACY_POLICY);
85 privacy.get().accessoryType = 87 privacy.accessoryType = MDCCollectionViewCellAccessoryDisclosureIndicator;
86 MDCCollectionViewCellAccessoryDisclosureIndicator; 88 privacy.accessibilityTraits = UIAccessibilityTraitButton;
87 privacy.get().accessibilityTraits = UIAccessibilityTraitButton;
88 [model addItem:privacy toSectionWithIdentifier:SectionIdentifierLinks]; 89 [model addItem:privacy toSectionWithIdentifier:SectionIdentifierLinks];
89 90
90 [model addSectionWithIdentifier:SectionIdentifierFooter]; 91 [model addSectionWithIdentifier:SectionIdentifierFooter];
91 92
92 base::scoped_nsobject<VersionItem> version( 93 VersionItem* version = [[VersionItem alloc] initWithType:ItemTypeVersion];
93 [[VersionItem alloc] initWithType:ItemTypeVersion]); 94 version.text = [self versionDescriptionString];
94 version.get().text = [self versionDescriptionString]; 95 version.accessibilityTraits = UIAccessibilityTraitButton;
95 version.get().accessibilityTraits = UIAccessibilityTraitButton;
96 [model addItem:version toSectionWithIdentifier:SectionIdentifierFooter]; 96 [model addItem:version toSectionWithIdentifier:SectionIdentifierFooter];
97 } 97 }
98 98
99 #pragma mark UICollectionViewDelegate 99 #pragma mark UICollectionViewDelegate
100 100
101 - (void)collectionView:(UICollectionView*)collectionView 101 - (void)collectionView:(UICollectionView*)collectionView
102 didSelectItemAtIndexPath:(NSIndexPath*)indexPath { 102 didSelectItemAtIndexPath:(NSIndexPath*)indexPath {
103 [super collectionView:collectionView didSelectItemAtIndexPath:indexPath]; 103 [super collectionView:collectionView didSelectItemAtIndexPath:indexPath];
104 NSInteger itemType = 104 NSInteger itemType =
105 [self.collectionViewModel itemTypeForIndexPath:indexPath]; 105 [self.collectionViewModel itemTypeForIndexPath:indexPath];
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 - (NSString*)versionDescriptionString { 178 - (NSString*)versionDescriptionString {
179 return l10n_util::GetNSStringF(IDS_IOS_VERSION, 179 return l10n_util::GetNSStringF(IDS_IOS_VERSION,
180 base::UTF8ToUTF16([self versionString])); 180 base::UTF8ToUTF16([self versionString]));
181 } 181 }
182 182
183 - (NSString*)versionOnlyString { 183 - (NSString*)versionOnlyString {
184 return base::SysUTF8ToNSString([self versionString]); 184 return base::SysUTF8ToNSString([self versionString]);
185 } 185 }
186 186
187 @end 187 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/settings/BUILD.gn ('k') | ios/chrome/browser/ui/settings/accounts_collection_view_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698