Commit c1550869 authored by Nohemi Fernandez's avatar Nohemi Fernandez Committed by Commit Bot

[iOS] Remove references to flag kClearSyncedData.

Feature ClearSyncedData has been enabled by default. Clean up code.

Bug: 1005509
Change-Id: I8eaea684e754afda13bcde2134e4fa5e2434c9ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2260193
Commit-Queue: Nohemi Fernandez <fernandex@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Auto-Submit: Nohemi Fernandez <fernandex@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781276}
parent 059e7e86
...@@ -234,30 +234,24 @@ typedef NS_ENUM(NSInteger, ItemType) { ...@@ -234,30 +234,24 @@ typedef NS_ENUM(NSInteger, ItemType) {
toSectionWithIdentifier:SectionIdentifierAccounts]; toSectionWithIdentifier:SectionIdentifierAccounts];
// Sign out section. // Sign out section.
if (base::FeatureList::IsEnabled(kClearSyncedData)) { [model addSectionWithIdentifier:SectionIdentifierSignOut];
[model addSectionWithIdentifier:SectionIdentifierSignOut]; // Adds a signout option if the account is not managed.
// Adds a signout option if the account is not managed. if (![self authService]->IsAuthenticatedIdentityManaged()) {
if (![self authService]->IsAuthenticatedIdentityManaged()) { [model addItem:[self experimentalSignOutItem]
[model addItem:[self experimentalSignOutItem]
toSectionWithIdentifier:SectionIdentifierSignOut];
}
// Adds a signout and clear data option.
[model addItem:[self experimentalSignOutAndClearDataItem]
toSectionWithIdentifier:SectionIdentifierSignOut]; toSectionWithIdentifier:SectionIdentifierSignOut];
}
// Adds a footer with signout explanation depending on the type of // Adds a signout and clear data option.
// account whether managed or non-managed. [model addItem:[self experimentalSignOutAndClearDataItem]
if ([self authService]->IsAuthenticatedIdentityManaged()) { toSectionWithIdentifier:SectionIdentifierSignOut];
[model setFooter:[self signOutManagedAccountFooterItem]
forSectionWithIdentifier:SectionIdentifierSignOut]; // Adds a footer with signout explanation depending on the type of
} else { // account whether managed or non-managed.
[model setFooter:[self signOutNonManagedAccountFooterItem] if ([self authService]->IsAuthenticatedIdentityManaged()) {
forSectionWithIdentifier:SectionIdentifierSignOut]; [model setFooter:[self signOutManagedAccountFooterItem]
} forSectionWithIdentifier:SectionIdentifierSignOut];
} else { } else {
[model addSectionWithIdentifier:SectionIdentifierSignOut]; [model setFooter:[self signOutNonManagedAccountFooterItem]
[model addItem:[self signOutItem] forSectionWithIdentifier:SectionIdentifierSignOut];
toSectionWithIdentifier:SectionIdentifierSignOut];
} }
} }
...@@ -370,13 +364,9 @@ typedef NS_ENUM(NSInteger, ItemType) { ...@@ -370,13 +364,9 @@ typedef NS_ENUM(NSInteger, ItemType) {
break; break;
} }
case ItemTypeSignOut: { case ItemTypeSignOut: {
if (base::FeatureList::IsEnabled(kClearSyncedData)) { UIView* itemView =
UIView* itemView = [[tableView cellForRowAtIndexPath:indexPath] contentView];
[[tableView cellForRowAtIndexPath:indexPath] contentView]; [self showSignOutWithClearData:NO itemView:itemView];
[self showSignOutWithClearData:NO itemView:itemView];
} else {
[self showSignOut];
}
break; break;
} }
case ItemTypeSignOutAndClearData: { case ItemTypeSignOutAndClearData: {
...@@ -598,10 +588,9 @@ typedef NS_ENUM(NSInteger, ItemType) { ...@@ -598,10 +588,9 @@ typedef NS_ENUM(NSInteger, ItemType) {
self.navigationController) self.navigationController)
popViewControllerOrCloseSettingsAnimated:YES]; popViewControllerOrCloseSettingsAnimated:YES];
}); });
// Get UMA metrics on the usage of the new UI, which is only available for // Get UMA metrics on the usage of different options for signout available
// users in the experiement with non-managed accounts. // for users with non-managed accounts.
if (base::FeatureList::IsEnabled(kClearSyncedData) && if (![self authService]->IsAuthenticatedIdentityManaged()) {
![self authService]->IsAuthenticatedIdentityManaged()) {
UMA_HISTOGRAM_BOOLEAN("Signin.UserRequestedWipeDataOnSignout", UMA_HISTOGRAM_BOOLEAN("Signin.UserRequestedWipeDataOnSignout",
forceClearData); forceClearData);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment