CollectionViewTextItem no longer styles CollectionViewTextCell

ios/chrome/browser/ui/settings/privacy_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/privacy_collection_view_controller.h"
 
 #include "base/ios/ios_util.h"
 #import "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
@@ skipping 10 matching lines @@
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
 #include "ios/chrome/browser/experimental_flags.h"
 #include "ios/chrome/browser/physical_web/physical_web_constants.h"
 #include "ios/chrome/browser/pref_names.h"
 #import "ios/chrome/browser/prefs/pref_observer_bridge.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_switch_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/contextual_search/touch_to_search_permissions_mediator.h"
 #import "ios/chrome/browser/ui/settings/accounts_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/clear_browsing_data_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/contextual_search_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/dataplan_usage_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/do_not_track_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/handoff_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/physical_web_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
 #import "ios/chrome/browser/ui/settings/settings_utils.h"
 #import "ios/chrome/browser/ui/settings/utils/pref_backed_boolean.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #include "ios/chrome/grit/ios_chromium_strings.h"
 #include "ios/chrome/grit/ios_strings.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 "ios/web/public/web_capabilities.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "url/gurl.h"
 
 NSString* const kPrivacyCollectionViewId = @"kPrivacyCollectionViewId";
 
 namespace {
 
 typedef NS_ENUM(NSInteger, SectionIdentifier) {
@@ skipping 100 matching lines @@
   [super loadModel];
 
   CollectionViewModel* model = self.collectionViewModel;
 
   // Other Devices Section
   [model addSectionWithIdentifier:SectionIdentifierOtherDevices];
   CollectionViewTextItem* otherDevicesHeader = [[[CollectionViewTextItem alloc]
       initWithType:ItemTypeOtherDevicesHeader] autorelease];
   otherDevicesHeader.text =
       l10n_util::GetNSString(IDS_IOS_OPTIONS_CONTINUITY_LABEL);
-  otherDevicesHeader.textColor = [[MDCPalette greyPalette] tint500];
   [model setHeader:otherDevicesHeader
       forSectionWithIdentifier:SectionIdentifierOtherDevices];
   [model addItem:[self handoffDetailItem]
       toSectionWithIdentifier:SectionIdentifierOtherDevices];
 
   // Web Services Section
   [model addSectionWithIdentifier:SectionIdentifierWebServices];
   CollectionViewTextItem* webServicesHeader = [[[CollectionViewTextItem alloc]
       initWithType:ItemTypeWebServicesHeader] autorelease];
   webServicesHeader.text =
       l10n_util::GetNSString(IDS_IOS_OPTIONS_WEB_SERVICES_LABEL);
-  webServicesHeader.textColor = [[MDCPalette greyPalette] tint500];
   [model setHeader:webServicesHeader
       forSectionWithIdentifier:SectionIdentifierWebServices];
   _showSuggestionsItem.reset([[self showSuggestionsSwitchItem] retain]);
   [model addItem:_showSuggestionsItem
       toSectionWithIdentifier:SectionIdentifierWebServices];
 
   if ([TouchToSearchPermissionsMediator isTouchToSearchAvailableOnDevice]) {
     [model addItem:[self contextualSearchDetailItem]
         toSectionWithIdentifier:SectionIdentifierWebServices];
   }
@@ skipping 137 matching lines @@
 
   NSInteger itemType =
       [self.collectionViewModel itemTypeForIndexPath:indexPath];
 
   if (itemType == ItemTypeWebServicesShowSuggestions) {
     CollectionViewSwitchCell* switchCell =
         base::mac::ObjCCastStrict<CollectionViewSwitchCell>(cell);
     [switchCell.switchView addTarget:self
                               action:@selector(showSuggestionsToggled:)
                     forControlEvents:UIControlEventValueChanged];
+  } else if (itemType == ItemTypeOtherDevicesHeader ||
+             itemType == ItemTypeWebServicesHeader) {
+    CollectionViewTextCell* textCell =
+        base::mac::ObjCCastStrict<CollectionViewTextCell>(cell);
+    textCell.textLabel.textColor = [[MDCPalette greyPalette] tint500];
   }
 
   return cell;
 }
 
 #pragma mark UICollectionViewDelegate
 - (void)collectionView:(UICollectionView*)collectionView
     didSelectItemAtIndexPath:(NSIndexPath*)indexPath {
   [super collectionView:collectionView didSelectItemAtIndexPath:indexPath];
   NSInteger itemType =
@@ skipping 146 matching lines @@
 
     _sendUsageDetailItem.get().detailText = detailText;
 
     [self reconfigureCellsForItems:@[ _sendUsageDetailItem ]
            inSectionWithIdentifier:SectionIdentifierWebServices];
     return;
   }
 }
 
 @end