ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm - Issue 2761263003: Allow CollectionViewModel/Controller queries without SectionIdentifier

Unified Diff: ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm

Issue 2761263003: Allow CollectionViewModel/Controller queries without SectionIdentifier (Closed)

Patch Set: Cleanup 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 side-by-side diff with in-line comments

« ios/chrome/browser/ui/collection_view/collection_view_model.h ('K') | « ios/chrome/browser/ui/settings/settings_collection_view_controller.mm ('k') | ios/chrome/browser/ui/settings/time_range_selector_collection_view_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm b/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm

index 0632a09b8558ae51d52bbdb29207a196537b345e..81ac54260dd4f45a43e60cb22b00b04fe0255ddc 100644

--- a/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm

+++ b/ios/chrome/browser/ui/settings/sync_settings_collection_view_controller.mm

@@ -723,8 +723,7 @@ typedef NS_ENUM(NSInteger, ItemType) {

SyncSwitchItem* syncItem = base::mac::ObjCCastStrict<SyncSwitchItem>(

[self.collectionViewModel itemAtIndexPath:indexPath]);

syncItem.on = _syncSetupService->IsSyncEnabled();

- [self reconfigureCellsForItems:@[ syncItem ]

- inSectionWithIdentifier:SectionIdentifierEnableSync];

+ [self reconfigureCellsForItems:@[ syncItem ]];

// Update Sync Accounts section.

if ([self hasAccountsSection]) {

@@ -745,8 +744,7 @@ typedef NS_ENUM(NSInteger, ItemType) {

accountItem.enabled = _syncSetupService->IsSyncEnabled();

[accountsToReconfigure addObject:accountItem];

}

- [self reconfigureCellsForItems:accountsToReconfigure

- inSectionWithIdentifier:SectionIdentifierSyncAccounts];

+ [self reconfigureCellsForItems:accountsToReconfigure];

}

// Update Sync Services section.

@@ -758,8 +756,7 @@ typedef NS_ENUM(NSInteger, ItemType) {

[self.collectionViewModel itemAtIndexPath:indexPath]);

syncEverythingItem.on = _syncSetupService->IsSyncingAllDataTypes();

syncEverythingItem.enabled = [self shouldSyncEverythingItemBeEnabled];

- [self reconfigureCellsForItems:@[ syncEverythingItem ]

- inSectionWithIdentifier:SectionIdentifierSyncServices];

+ [self reconfigureCellsForItems:@[ syncEverythingItem ]];

NSInteger section = [self.collectionViewModel

sectionForSectionIdentifier:SectionIdentifierSyncServices];

@@ -783,8 +780,7 @@ typedef NS_ENUM(NSInteger, ItemType) {

syncSwitchItem.enabled = [self shouldSyncableItemsBeEnabled];

[switchsToReconfigure addObject:syncSwitchItem];

}

- [self reconfigureCellsForItems:switchsToReconfigure

- inSectionWithIdentifier:SectionIdentifierSyncServices];

+ [self reconfigureCellsForItems:switchsToReconfigure];

// Update Encryption cell.

[self updateEncryptionCell];

@@ -827,8 +823,7 @@ typedef NS_ENUM(NSInteger, ItemType) {

[self.collectionViewModel itemAtIndexPath:indexPath]);

item.shouldDisplayError = shouldDisplayEncryptionError;

item.enabled = [self shouldEncryptionItemBeEnabled];

- [self reconfigureCellsForItems:@[ item ]

- inSectionWithIdentifier:SectionIdentifierEncryptionAndFooter];

+ [self reconfigureCellsForItems:@[ item ]];

}

- (void)updateAccountItem:(CollectionViewAccountItem*)item

@@ -965,8 +960,7 @@ typedef NS_ENUM(NSInteger, ItemType) {

base::mac::ObjCCastStrict<CollectionViewAccountItem>(

[_identityMap objectForKey:identity.gaiaID]);

[self updateAccountItem:item withIdentity:identity];

- [self reconfigureCellsForItems:@[ item ]

- inSectionWithIdentifier:SectionIdentifierSyncAccounts];

+ [self reconfigureCellsForItems:@[ item ]];

}

- (void)onChromeIdentityServiceWillBeDestroyed {