Chromium Code Reviews| Index: ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller.mm |
| diff --git a/ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller.mm b/ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller.mm |
| index 1a128bd23d510829a4a69452d2909b5e69cb4c77..1fc3093dd1b7c9a4f015c942ab8885e177f7b996 100644 |
| --- a/ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller.mm |
| +++ b/ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller.mm |
| @@ -39,6 +39,7 @@ |
| #import "ios/chrome/browser/ui/collection_view/cells/collection_view_detail_item.h" |
| #import "ios/chrome/browser/ui/collection_view/cells/collection_view_footer_item.h" |
| #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h" |
| +#import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_cell.h" |
| #import "ios/chrome/browser/ui/collection_view/cells/collection_view_text_item.h" |
| #import "ios/chrome/browser/ui/collection_view/collection_view_model.h" |
| #import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h" |
| @@ -56,6 +57,7 @@ |
| #import "ios/public/provider/chrome/browser/chrome_browser_provider.h" |
| #import "ios/public/provider/chrome/browser/images/branded_image_provider.h" |
| #import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h" |
| +#import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h" |
| #include "ui/base/l10n/l10n_util_mac.h" |
| #include "url/gurl.h" |
| @@ -330,7 +332,6 @@ const int kMaxTimesHistoryNoticeShown = 1; |
| initWithType:ItemTypeClearBrowsingDataButton]; |
| clearButtonItem.text = l10n_util::GetNSString(IDS_IOS_CLEAR_BUTTON); |
| clearButtonItem.accessibilityTraits |= UIAccessibilityTraitButton; |
| - clearButtonItem.textColor = [[MDCPalette cr_redPalette] tint500]; |
| [model addItem:clearButtonItem |
| toSectionWithIdentifier:SectionIdentifierClearBrowsingDataButton]; |
| @@ -798,6 +799,28 @@ const int kMaxTimesHistoryNoticeShown = 1; |
| browsing_data::GetCounterTextFromResult(&result)); |
| } |
| +#pragma mark - UICollectionViewDataSource |
| + |
| +- (UICollectionViewCell*)collectionView:(UICollectionView*)collectionView |
| + cellForItemAtIndexPath:(NSIndexPath*)indexPath { |
| + UICollectionViewCell* cell = |
| + [super collectionView:collectionView cellForItemAtIndexPath:indexPath]; |
| + |
| + NSInteger itemType = |
| + [self.collectionViewModel itemTypeForIndexPath:indexPath]; |
| + switch (itemType) { |
| + case ItemTypeClearBrowsingDataButton: { |
| + CollectionViewTextCell* textCell = |
| + base::mac::ObjCCastStrict<CollectionViewTextCell>(cell); |
| + textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500]; |
|
gambard
2017/04/14 07:04:03
Didn't you move from red to grey?
|
| + break; |
| + } |
| + default: |
| + break; |
| + } |
| + return cell; |
| +} |
| + |
| #pragma mark MDCCollectionViewStylingDelegate |
| - (BOOL)collectionView:(UICollectionView*)collectionView |