Commit c7b40cce authored by Tina Wang's avatar Tina Wang Committed by Commit Bot

[ios] Support managed settings UI for SafeBrowsingEnabled

Show managed UI when SafeBrowsingEnabled policy is set by enterprise.

Bug: 1119647
Change-Id: Ia6ccb0af0d61964867dec60be0f901040553af22
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366002Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Commit-Queue: Tina Wang <tinazwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800143}
parent 1afb15d6
...@@ -87,6 +87,7 @@ typedef NS_ENUM(NSInteger, ItemType) { ...@@ -87,6 +87,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
AutocompleteSearchesAndURLsItemType, AutocompleteSearchesAndURLsItemType,
AutocompleteSearchesAndURLsManagedItemType, AutocompleteSearchesAndURLsManagedItemType,
SafeBrowsingItemType, SafeBrowsingItemType,
SafeBrowsingManagedItemType,
ImproveChromeItemType, ImproveChromeItemType,
BetterSearchAndBrowsingItemType, BetterSearchAndBrowsingItemType,
ItemTypePasswordLeakCheckSwitch, ItemTypePasswordLeakCheckSwitch,
...@@ -535,6 +536,12 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error"; ...@@ -535,6 +536,12 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
base::mac::ObjCCast<SyncSwitchItem>(item).on = base::mac::ObjCCast<SyncSwitchItem>(item).on =
self.safeBrowsingPreference.value; self.safeBrowsingPreference.value;
break; break;
case SafeBrowsingManagedItemType:
base::mac::ObjCCast<TableViewInfoButtonItem>(item).statusText =
self.safeBrowsingPreference.value
? l10n_util::GetNSString(IDS_IOS_SETTING_ON)
: l10n_util::GetNSString(IDS_IOS_SETTING_OFF);
break;
case ImproveChromeItemType: case ImproveChromeItemType:
base::mac::ObjCCast<SyncSwitchItem>(item).on = base::mac::ObjCCast<SyncSwitchItem>(item).on =
self.sendDataUsagePreference.value; self.sendDataUsagePreference.value;
...@@ -617,16 +624,30 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error"; ...@@ -617,16 +624,30 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
[items addObject:autocompleteItem]; [items addObject:autocompleteItem];
} }
if (base::FeatureList::IsEnabled(kSafeBrowsingAvailableOnIOS)) { if (base::FeatureList::IsEnabled(kSafeBrowsingAvailableOnIOS)) {
SyncSwitchItem* safeBrowsingItem = [self if (base::FeatureList::IsEnabled(kEnableIOSManagedSettingsUI) &&
switchItemWithItemType:SafeBrowsingItemType self.userPrefService->IsManagedPreference(
textStringID: prefs::kSafeBrowsingEnabled)) {
IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_TEXT TableViewInfoButtonItem* safeBrowsingManagedItem = [self
detailStringID: TableViewInfoButtonItemType:
IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_DETAIL AutocompleteSearchesAndURLsManagedItemType
dataType:0]; textStringID:
safeBrowsingItem.accessibilityIdentifier = IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_TEXT
kSafeBrowsingItemAccessibilityIdentifier; detailStringID:
[items addObject:safeBrowsingItem]; IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_DETAIL
status:self.safeBrowsingPreference];
[items addObject:safeBrowsingManagedItem];
} else {
SyncSwitchItem* safeBrowsingItem = [self
switchItemWithItemType:SafeBrowsingItemType
textStringID:
IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_TEXT
detailStringID:
IDS_IOS_GOOGLE_SERVICES_SETTINGS_SAFE_BROWSING_DETAIL
dataType:0];
safeBrowsingItem.accessibilityIdentifier =
kSafeBrowsingItemAccessibilityIdentifier;
[items addObject:safeBrowsingItem];
}
} }
[items addObject:self.passwordLeakCheckItem]; [items addObject:self.passwordLeakCheckItem];
SyncSwitchItem* improveChromeItem = SyncSwitchItem* improveChromeItem =
...@@ -849,6 +870,7 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error"; ...@@ -849,6 +870,7 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
case SignInItemType: case SignInItemType:
case RestartAuthenticationFlowErrorItemType: case RestartAuthenticationFlowErrorItemType:
case ReauthDialogAsSyncIsInAuthErrorItemType: case ReauthDialogAsSyncIsInAuthErrorItemType:
case SafeBrowsingManagedItemType:
case ShowPassphraseDialogErrorItemType: case ShowPassphraseDialogErrorItemType:
case SyncNeedsTrustedVaultKeyErrorItemType: case SyncNeedsTrustedVaultKeyErrorItemType:
case SyncDisabledByAdministratorErrorItemType: case SyncDisabledByAdministratorErrorItemType:
...@@ -895,6 +917,7 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error"; ...@@ -895,6 +917,7 @@ NSString* kGoogleServicesSyncErrorImage = @"google_services_sync_error";
case AutocompleteSearchesAndURLsItemType: case AutocompleteSearchesAndURLsItemType:
case AutocompleteSearchesAndURLsManagedItemType: case AutocompleteSearchesAndURLsManagedItemType:
case SafeBrowsingItemType: case SafeBrowsingItemType:
case SafeBrowsingManagedItemType:
case ItemTypePasswordLeakCheckSwitch: case ItemTypePasswordLeakCheckSwitch:
case ImproveChromeItemType: case ImproveChromeItemType:
case BetterSearchAndBrowsingItemType: case BetterSearchAndBrowsingItemType:
......
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