CrOS Settings: Update Secure DNS String
OS Settings Revamp Disabled: https://screenshot.googleplex.com/3r8zS5azs2C89Nd
OS Settings Revamp Enabled: https://screenshot.googleplex.com/BEdEtuFBwDjcyqF
Bug: b:323966128
Test: Manually test the UI that the correct strings appear.
Change-Id: I10c361e6951b9cffa5de8d57065eb8283a725960
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5288479
Reviewed-by: Wes Okuhara <wesokuhara@google.com>
Commit-Queue: Nikki Moteva <moteva@google.com>
Cr-Commit-Position: refs/heads/main@{#1260744}
diff --git a/chrome/app/os_settings_strings.grdp b/chrome/app/os_settings_strings.grdp
index 73df979..002d1a7 100644
--- a/chrome/app/os_settings_strings.grdp
+++ b/chrome/app/os_settings_strings.grdp
@@ -6497,11 +6497,11 @@
<message name="IDS_OS_SETTINGS_PRIVACY_HUB_NO_APP_CAN_USE_LOCATION_TEXT" translateable="false" desc="The text displayed in the Apps section of the location subpage when location is not allowed.">
No app is allowed to use your location
</message>
- <message name="IDS_OS_SETTINGS_REVAMP_SECURE_DNS" desc="Text for secure DNS toggle in Privacy options for ChromeOS">
- Encrypt URLs entered into the browser
+ <message name="IDS_OS_SETTINGS_SECURE_DNS_TITLE" desc="Text for secure DNS toggle in Privacy options for ChromeOS">
+ Use secure connections to look up sites
</message>
- <message name="IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DESCRIPTION" desc="Secondary, continued explanation of secure DNS in Privacy options for ChromeOS">
- Use secure Domain Name Servers (DNS) to prevent those with access to your internet traffic from seeing which web pages you visit
+ <message name="IDS_OS_SETTINGS_SECURE_DNS_DESCRIPTION" desc="Description of secure DNS in Privacy options for ChromeOS">
+ Make it harder for people with access to your internet traffic to see which sites you visit. ChromeOS uses a secure connection to look up a site's IP address in the DNS (Domain Name System).
</message>
<message name="IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DIALOG_TITLE" desc="Text for secure DNS dialog title in Privacy options for ChromeOS">
Turn off URL encryption?
diff --git a/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_REVAMP_SECURE_DNS.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_REVAMP_SECURE_DNS.png.sha1
deleted file mode 100644
index 852debee..0000000
--- a/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_REVAMP_SECURE_DNS.png.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2d37df3a220a8866bed37c006f87813e8109d73e
\ No newline at end of file
diff --git a/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DESCRIPTION.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DESCRIPTION.png.sha1
deleted file mode 100644
index dc9e5122..0000000
--- a/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DESCRIPTION.png.sha1
+++ /dev/null
@@ -1 +0,0 @@
-90f4b89ad93ffba184230b0f52d24e01c1fa84d2
\ No newline at end of file
diff --git a/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_SECURE_DNS_DESCRIPTION.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_SECURE_DNS_DESCRIPTION.png.sha1
new file mode 100644
index 0000000..d66427b9
--- /dev/null
+++ b/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_SECURE_DNS_DESCRIPTION.png.sha1
@@ -0,0 +1 @@
+5287bdc2fa0c7390eedb81dca29b2cf091dc0aab
\ No newline at end of file
diff --git a/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_SECURE_DNS_TITLE.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_SECURE_DNS_TITLE.png.sha1
new file mode 100644
index 0000000..7563e4e
--- /dev/null
+++ b/chrome/app/os_settings_strings_grdp/IDS_OS_SETTINGS_SECURE_DNS_TITLE.png.sha1
@@ -0,0 +1 @@
+91a052436b9615750a7e063c83a7200b3054205a
\ No newline at end of file
diff --git a/chrome/browser/resources/ash/settings/os_privacy_page/secure_dns.ts b/chrome/browser/resources/ash/settings/os_privacy_page/secure_dns.ts
index 53c9d4d9..1600d85 100644
--- a/chrome/browser/resources/ash/settings/os_privacy_page/secure_dns.ts
+++ b/chrome/browser/resources/ash/settings/os_privacy_page/secure_dns.ts
@@ -333,11 +333,8 @@
// hashed with a salt and hex encoded), then the message will contain the
// template URI for display in which the identifiers are shown in plain
// text.
- let secureDescription = loadTimeData.getString('secureDnsDescription');
- if (this.isRevampWayfindingEnabled_) {
- secureDescription =
- loadTimeData.getString('secureDnsOsSettingsDescription');
- }
+ let secureDescription =
+ loadTimeData.getString('secureDnsOsSettingsDescription');
if (setting.dohWithIdentifiersActive) {
secureDescription = loadTimeData.substituteString(
diff --git a/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc
index c3072e9..b09d6f3 100644
--- a/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.cc
@@ -256,47 +256,42 @@
}
void AddSecureDnsStrings(content::WebUIDataSource* html_source) {
-#if BUILDFLAG(IS_CHROMEOS_ASH)
- const bool kIsRevampEnabled =
- ash::features::IsOsSettingsRevampWayfindingEnabled();
-#endif
-
webui::LocalizedString kLocalizedStrings[] = {
- {"secureDns", IDS_SETTINGS_SECURE_DNS},
- {"secureDnsDescription", IDS_SETTINGS_SECURE_DNS_DESCRIPTION},
+ {"secureDns", IDS_SETTINGS_SECURE_DNS},
+ {"secureDnsDescription", IDS_SETTINGS_SECURE_DNS_DESCRIPTION},
#if BUILDFLAG(IS_CHROMEOS_ASH)
- {"secureDnsOsSettingsTitle", kIsRevampEnabled
- ? IDS_OS_SETTINGS_REVAMP_SECURE_DNS
- : IDS_SETTINGS_SECURE_DNS},
- {"secureDnsOsSettingsDescription",
- kIsRevampEnabled ? IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DESCRIPTION
- : IDS_SETTINGS_SECURE_DNS_DESCRIPTION},
- {"secureDnsWithIdentifiersDescription",
- IDS_SETTINGS_SECURE_DNS_WITH_IDENTIFIERS_DESCRIPTION},
- {"secureDnsDialogTitle", IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DIALOG_TITLE},
- {"secureDnsDialogBody", IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DIALOG_BODY},
- {"secureDnsDialogCancel", IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DIALOG_CANCEL},
- {"secureDnsDialogTurnOff",
- IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DIALOG_TURN_OFF},
+ {"secureDnsOsSettingsTitle", IDS_OS_SETTINGS_SECURE_DNS_TITLE},
+ {"secureDnsOsSettingsDescription",
+ IDS_OS_SETTINGS_SECURE_DNS_DESCRIPTION},
+ {"secureDnsWithIdentifiersDescription",
+ IDS_SETTINGS_SECURE_DNS_WITH_IDENTIFIERS_DESCRIPTION},
+ {"secureDnsDialogTitle", IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DIALOG_TITLE},
+ {"secureDnsDialogBody", IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DIALOG_BODY},
+ {"secureDnsDialogCancel",
+ IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DIALOG_CANCEL},
+ {"secureDnsDialogTurnOff",
+ IDS_OS_SETTINGS_REVAMP_SECURE_DNS_DIALOG_TURN_OFF},
#endif
- {"secureDnsDisabledForManagedEnvironment",
- IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_MANAGED_ENVIRONMENT},
- {"secureDnsDisabledForParentalControl",
- IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_PARENTAL_CONTROL},
- {"secureDnsAutomaticModeDescription",
- IDS_SETTINGS_AUTOMATIC_MODE_DESCRIPTION},
- {"secureDnsCustomProviderDescription",
- IDS_SETTINGS_SECURE_DNS_CUSTOM_DESCRIPTION},
- {"secureDnsDropdownA11yLabel",
- IDS_SETTINGS_SECURE_DNS_DROPDOWN_ACCESSIBILITY_LABEL},
- {"secureDnsSecureDropdownModeDescription",
- IDS_SETTINGS_SECURE_DROPDOWN_MODE_DESCRIPTION},
- {"secureDnsSecureDropdownModePrivacyPolicy",
- IDS_SETTINGS_SECURE_DROPDOWN_MODE_PRIVACY_POLICY},
- {"secureDnsCustomPlaceholder", IDS_SETTINGS_SECURE_DNS_CUSTOM_PLACEHOLDER},
- {"secureDnsCustomFormatError", IDS_SETTINGS_SECURE_DNS_CUSTOM_FORMAT_ERROR},
- {"secureDnsCustomConnectionError",
- IDS_SETTINGS_SECURE_DNS_CUSTOM_CONNECTION_ERROR},
+ {"secureDnsDisabledForManagedEnvironment",
+ IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_MANAGED_ENVIRONMENT},
+ {"secureDnsDisabledForParentalControl",
+ IDS_SETTINGS_SECURE_DNS_DISABLED_FOR_PARENTAL_CONTROL},
+ {"secureDnsAutomaticModeDescription",
+ IDS_SETTINGS_AUTOMATIC_MODE_DESCRIPTION},
+ {"secureDnsCustomProviderDescription",
+ IDS_SETTINGS_SECURE_DNS_CUSTOM_DESCRIPTION},
+ {"secureDnsDropdownA11yLabel",
+ IDS_SETTINGS_SECURE_DNS_DROPDOWN_ACCESSIBILITY_LABEL},
+ {"secureDnsSecureDropdownModeDescription",
+ IDS_SETTINGS_SECURE_DROPDOWN_MODE_DESCRIPTION},
+ {"secureDnsSecureDropdownModePrivacyPolicy",
+ IDS_SETTINGS_SECURE_DROPDOWN_MODE_PRIVACY_POLICY},
+ {"secureDnsCustomPlaceholder",
+ IDS_SETTINGS_SECURE_DNS_CUSTOM_PLACEHOLDER},
+ {"secureDnsCustomFormatError",
+ IDS_SETTINGS_SECURE_DNS_CUSTOM_FORMAT_ERROR},
+ {"secureDnsCustomConnectionError",
+ IDS_SETTINGS_SECURE_DNS_CUSTOM_CONNECTION_ERROR},
};
html_source->AddLocalizedStrings(kLocalizedStrings);
}
diff --git a/chrome/test/data/webui/settings/chromeos/os_privacy_page/secure_dns_test.ts b/chrome/test/data/webui/settings/chromeos/os_privacy_page/secure_dns_test.ts
index 56a22a2..73df96c 100644
--- a/chrome/test/data/webui/settings/chromeos/os_privacy_page/secure_dns_test.ts
+++ b/chrome/test/data/webui/settings/chromeos/os_privacy_page/secure_dns_test.ts
@@ -142,7 +142,7 @@
suiteSetup(function() {
loadTimeData.overrideValues({
showSecureDnsSetting: true,
- secureDnsDescription: defaultDescription,
+ secureDnsOsSettingsDescription: defaultDescription,
secureDnsDisabledForManagedEnvironment: managedEnvironmentDescription,
secureDnsDisabledForParentalControl: parentalControlDescription,
isRevampWayfindingEnabled: false,