CollectionViewTextItem no longer styles CollectionViewTextCell

ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller.h"
 
 #include <memory>
 #include <string>
 
 #include "base/ios/ios_util.h"
@@ skipping 21 matching lines @@
 #include "ios/chrome/browser/browsing_data/ios_chrome_browsing_data_remover.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "ios/chrome/browser/experimental_flags.h"
 #include "ios/chrome/browser/history/web_history_service_factory.h"
 #include "ios/chrome/browser/signin/signin_manager_factory.h"
 #include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h"
 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
 #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"
 #import "ios/chrome/browser/ui/commands/UIKit+ChromeExecuteCommand.h"
 #import "ios/chrome/browser/ui/commands/clear_browsing_data_command.h"
 #include "ios/chrome/browser/ui/commands/ios_command_ids.h"
 #import "ios/chrome/browser/ui/commands/open_url_command.h"
 #import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #import "ios/chrome/browser/ui/settings/time_range_selector_collection_view_controller.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 #include "ios/chrome/common/channel_info.h"
 #include "ios/chrome/grit/ios_chromium_strings.h"
 #include "ios/chrome/grit/ios_strings.h"
 #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"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 NSString* const kClearBrowsingDataCollectionViewId =
     @"kClearBrowsingDataCollectionViewId";
 NSString* const kClearBrowsingHistoryCellId = @"kClearBrowsingHistoryCellId";
@@ skipping 254 matching lines @@
                          prefName:browsing_data::prefs::kDeleteFormData];
   [model addItem:autofillItem
       toSectionWithIdentifier:SectionIdentifierDataTypes];
 
   // Clear Browsing Data button.
   [model addSectionWithIdentifier:SectionIdentifierClearBrowsingDataButton];
   CollectionViewTextItem* clearButtonItem = [[CollectionViewTextItem alloc]
       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];
 
   // Google Account footer.
   SigninManager* signinManager =
       ios::SigninManagerFactory::GetForBrowserState(_browserState);
   if (signinManager->IsAuthenticated()) {
     // TODO(crbug.com/650424): Footer items must currently go into a separate
     // section, to work around a drawing bug in MDC.
     [model addSectionWithIdentifier:SectionIdentifierGoogleAccount];
@@ skipping 447 matching lines @@
                  : l10n_util::GetNSStringF(
                        IDS_DEL_CACHE_COUNTER_UPPER_ESTIMATE,
                        base::SysNSStringToUTF16(formattedSize));
     }
     return l10n_util::GetNSString(IDS_DEL_CACHE_COUNTER_ALMOST_EMPTY);
   }
   return base::SysUTF16ToNSString(
       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
     hidesInkViewAtIndexPath:(NSIndexPath*)indexPath {
   NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath];
   switch (type) {
     case ItemTypeFooterSavedSiteData:
     case ItemTypeFooterGoogleAccount:
     case ItemTypeFooterGoogleAccountAndMyActivity:
     case ItemTypeFooterClearSyncAndSavedSiteData:
@@ skipping 63 matching lines @@
 
 #pragma mark TimeRangeSelectorCollectionViewControllerDelegate
 
 - (void)timeRangeSelectorViewController:
             (TimeRangeSelectorCollectionViewController*)collectionViewController
                     didSelectTimePeriod:(browsing_data::TimePeriod)timePeriod {
   _timePeriod = timePeriod;
 }
 
 @end