Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4618)

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2627023006: WebUI: Remove i18n from cr_elements/network (Closed)
Patch Set: Allow <if> in settings_ui.html Created 3 years, 11 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
Download patch
Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
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 3d57d2c16639a8a92a926c962ff555a10bff77fe..d128acd07d946a5d763eef3dc0c76c799dc41db6 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
@@ -35,6 +35,7 @@
#if defined(OS_CHROMEOS)
#include "ash/common/system/chromeos/devicetype_utils.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h"
#include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
#include "chromeos/chromeos_switches.h"
#include "components/user_manager/user.h"
@@ -1751,19 +1752,8 @@ void AddWebContentStrings(content::WebUIDataSource* html_source) {
arraysize(localized_strings));
}
-} // namespace
-
#if defined(OS_CHROMEOS)
-void AddCrNetworkStrings(content::WebUIDataSource* html_source) {
- LocalizedString localized_strings[] = {
- {"networkDisabled", IDS_NETWORK_LIST_DISABLED},
- {"networkListItemConnected", IDS_NETWORK_LIST_CONNECTED},
- {"networkListItemConnecting", IDS_NETWORK_LIST_CONNECTING},
- {"networkListItemNotConnected", IDS_NETWORK_LIST_NOT_CONNECTED},
- {"vpnNameTemplate", IDS_NETWORK_LIST_THIRD_PARTY_VPN_NAME_TEMPLATE},
- };
- AddLocalizedStringsBulk(html_source, localized_strings,
- arraysize(localized_strings));
+void AddOncStrings(content::WebUIDataSource* html_source) {
LocalizedString onc_property_strings[] = {
// Thes strings are generated by prepending 'Onc' to the ONC property
// name. Any '.' in the property name is replaced with '-'. Properties
@@ -1808,11 +1798,6 @@ void AddCrNetworkStrings(content::WebUIDataSource* html_source) {
{"OncMacAddress", IDS_ONC_MAC_ADDRESS},
{"OncNotConnected", IDS_ONC_NOT_CONNECTED},
{"OncRestrictedConnectivity", IDS_ONC_RESTRICTED_CONNECTIVITY},
- {"OncTypeCellular", IDS_SETTINGS_NETWORK_TYPE_CELLULAR},
- {"OncTypeEthernet", IDS_SETTINGS_NETWORK_TYPE_ETHERNET},
- {"OncTypeVPN", IDS_SETTINGS_NETWORK_TYPE_VPN},
- {"OncTypeWiFi", IDS_SETTINGS_NETWORK_TYPE_WIFI},
- {"OncTypeWiMAX", IDS_SETTINGS_NETWORK_TYPE_WIMAX},
{"OncVPN-Host", IDS_ONC_VPN_HOST},
{"OncVPN-L2TP-Username", IDS_ONC_VPN_L2TP_USERNAME},
{"OncVPN-OpenVPN-Username", IDS_ONC_VPN_OPEN_VPN_USERNAME},
@@ -1833,6 +1818,8 @@ void AddCrNetworkStrings(content::WebUIDataSource* html_source) {
}
#endif // OS_CHROMEOS
+} // namespace
+
void AddLocalizedStrings(content::WebUIDataSource* html_source,
Profile* profile) {
AddA11yStrings(html_source);
@@ -1859,12 +1846,12 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
AddAccountUITweaksStrings(html_source, profile);
AddAndroidAppStrings(html_source);
AddBluetoothStrings(html_source);
- AddCrNetworkStrings(html_source);
AddDateTimeStrings(html_source);
AddDeviceStrings(html_source);
AddEasyUnlockStrings(html_source);
AddInternetStrings(html_source);
AddMultiProfilesStrings(html_source, profile);
+ AddOncStrings(html_source);
#else
AddDefaultBrowserStrings(html_source);
AddImportDataStrings(html_source);
@@ -1875,6 +1862,9 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
AddCertificateManagerStrings(html_source);
#endif
+#if defined(OS_CHROMEOS)
+ chromeos::network_element::AddLocalizedStrings(html_source);
+#endif
policy_indicator::AddLocalizedStrings(html_source);
html_source->SetJsonPath(kLocalizedStringsFile);

Powered by Google App Engine
This is Rietveld 408576698