[Network Settings] Fix auto-connect toggle label for cellular.
This CL changes auto-connect toggle label in the cellular settings page
to read "Automatically connect to cellular network" instead of
"Automatically connect to this network".
Screenshot: https://screenshot.googleplex.com/WfAnZq9Ti4c.png
Bug: 924236
Change-Id: Ic8bdd03cc73baea5584ed38294553798bdc8c87e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1531706
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Azeem Arshad <azeemarshad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#642714}diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
index 1b931f9..b488fc2 100644
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -1935,6 +1935,9 @@
<message name="IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT" desc="Settings > Internet > Network details: Label for the checkbox determining whether to automatically connect to the network.">
Automatically connect to this network
</message>
+ <message name="IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT_CELLULAR" desc="Settings > Internet > Mobile Data details: Label for the checkbox determining whether to automatically connect to the cellular network.">
+ Automatically connect to cellular network
+ </message>
<message name="IDS_SETTINGS_INTERNET_NETWORK_ALWAYS_ON_VPN" desc="Settings > Internet > Network details: Label for the checkbox determining that all internet traffic has to go through this VPN (virtual private network), and all other network connections are blocked.">
Always connect through this VPN
</message>
diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.html b/chrome/browser/resources/settings/internet_page/internet_detail_page.html
index 907239d..d0636ad 100644
--- a/chrome/browser/resources/settings/internet_page/internet_detail_page.html
+++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.html
@@ -175,7 +175,7 @@
managedNetworkAvailable)]]">
<div class="settings-box">
<div id="autoConnectToggleLabel" class="start settings-box-text">
- $i18n{networkAutoConnect}
+ [[getAutoConnectToggleLabel_(networkProperties_)]]
</div>
<template is="dom-if" if="[[isAutoConnectEnforcedByPolicy(
networkProperties_, globalPolicy)]]">
diff --git a/chrome/browser/resources/settings/internet_page/internet_detail_page.js b/chrome/browser/resources/settings/internet_page/internet_detail_page.js
index 5d6af27..1b748b27 100644
--- a/chrome/browser/resources/settings/internet_page/internet_detail_page.js
+++ b/chrome/browser/resources/settings/internet_page/internet_detail_page.js
@@ -478,6 +478,17 @@
/**
* @param {!CrOnc.NetworkProperties} networkProperties
+ * @return {string} The text to display for auto-connect toggle label.
+ * @private
+ */
+ getAutoConnectToggleLabel_: function(networkProperties) {
+ return this.isCellular_(networkProperties) ?
+ this.i18n('networkAutoConnectCellular') :
+ this.i18n('networkAutoConnect');
+ },
+
+ /**
+ * @param {!CrOnc.NetworkProperties} networkProperties
* @return {boolean} True if the network is connected.
* @private
*/
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index 7572fd2b..54669195f 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -1256,6 +1256,8 @@
IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING},
{"networkAlwaysOnVpn", IDS_SETTINGS_INTERNET_NETWORK_ALWAYS_ON_VPN},
{"networkAutoConnect", IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT},
+ {"networkAutoConnectCellular",
+ IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT_CELLULAR},
{"networkButtonActivate", IDS_SETTINGS_INTERNET_BUTTON_ACTIVATE},
{"networkButtonConfigure", IDS_SETTINGS_INTERNET_BUTTON_CONFIGURE},
{"networkButtonConnect", IDS_SETTINGS_INTERNET_BUTTON_CONNECT},
