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 d528201f5478fbfd5dad66c05a1473aeef0cca2f..d6c34f23d7e26c2ac848ec39ec49cf1b43736972 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 |
@@ -871,6 +871,7 @@ void AddInternetStrings(content::WebUIDataSource* html_source) { |
{"internetAddThirdPartyVPN", IDS_SETTINGS_INTERNET_ADD_THIRD_PARTY_VPN}, |
{"internetAddVPN", IDS_SETTINGS_INTERNET_ADD_VPN}, |
{"internetAddWiFi", IDS_SETTINGS_INTERNET_ADD_WIFI}, |
+ {"internetConfigTitle", IDS_SETTINGS_INTERNET_CONFIG}, |
{"internetDetailPageTitle", IDS_SETTINGS_INTERNET_DETAIL}, |
{"internetDeviceEnabling", IDS_SETTINGS_INTERNET_DEVICE_ENABLING}, |
{"internetKnownNetworksPageTitle", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS}, |
@@ -906,6 +907,7 @@ void AddInternetStrings(content::WebUIDataSource* html_source) { |
{"networkButtonForget", IDS_SETTINGS_INTERNET_BUTTON_FORGET}, |
{"networkButtonViewAccount", IDS_SETTINGS_INTERNET_BUTTON_VIEW_ACCOUNT}, |
{"networkConnectNotAllowed", IDS_SETTINGS_INTERNET_CONNECT_NOT_ALLOWED}, |
+ {"networkConfigShare", IDS_SETTINGS_INTERNET_CONFIG_SHARE}, |
{"networkIPAddress", IDS_SETTINGS_INTERNET_NETWORK_IP_ADDRESS}, |
{"networkIPConfigAuto", IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO}, |
{"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER}, |
@@ -1004,6 +1006,9 @@ void AddInternetStrings(content::WebUIDataSource* html_source) { |
}; |
AddLocalizedStringsBulk(html_source, localized_strings, |
arraysize(localized_strings)); |
+ html_source->AddBoolean("networkSettingsConfig", |
+ base::CommandLine::ForCurrentProcess()->HasSwitch( |
+ chromeos::switches::kNetworkSettingsConfig)); |
} |
#endif |
@@ -1990,6 +1995,23 @@ void AddOncStrings(content::WebUIDataSource* html_source) { |
IDS_ONC_CELLULAR_SERVING_OPERATOR_NAME}, |
{"OncConnected", IDS_ONC_CONNECTED}, |
{"OncConnecting", IDS_ONC_CONNECTING}, |
+ {"OncEAP-AnonymousIdentity", IDS_ONC_EAP_ANONYMOUS_IDENTITY}, |
+ {"OncEAP-Identity", IDS_ONC_EAP_IDENTITY}, |
+ {"OncEAP-Inner", IDS_ONC_EAP_INNER}, |
+ {"OncEAP-Inner_Automatic", IDS_ONC_EAP_INNER_AUTOMATIC}, |
+ {"OncEAP-Inner_CHAP", IDS_ONC_EAP_INNER_CHAP}, |
+ {"OncEAP-Inner_GTC", IDS_ONC_EAP_INNER_GTC}, |
+ {"OncEAP-Inner_MD5", IDS_ONC_EAP_INNER_MD5}, |
+ {"OncEAP-Inner_MSCHAP", IDS_ONC_EAP_INNER_MSCHAP}, |
+ {"OncEAP-Inner_MSCHAPv2", IDS_ONC_EAP_INNER_MSCHAPV2}, |
+ {"OncEAP-Inner_PAP", IDS_ONC_EAP_INNER_PAP}, |
+ {"OncEAP-Outer", IDS_ONC_EAP_OUTER}, |
+ {"OncEAP-Outer_LEAP", IDS_ONC_EAP_OUTER_LEAP}, |
+ {"OncEAP-Outer_PEAP", IDS_ONC_EAP_OUTER_PEAP}, |
+ {"OncEAP-Outer_EAP-TLS", IDS_ONC_EAP_OUTER_TLS}, |
+ {"OncEAP-Outer_EAP-TTLS", IDS_ONC_EAP_OUTER_TTLS}, |
+ {"OncEAP-Password", IDS_ONC_WIFI_PASSWORD}, |
+ {"OncEAP-SubjectMatch", IDS_ONC_EAP_SUBJECT_MATCH}, |
{"OncMacAddress", IDS_ONC_MAC_ADDRESS}, |
{"OncNotConnected", IDS_ONC_NOT_CONNECTED}, |
{"OncRestrictedConnectivity", IDS_ONC_RESTRICTED_CONNECTIVITY}, |
@@ -2013,19 +2035,14 @@ void AddOncStrings(content::WebUIDataSource* html_source) { |
IDS_ONC_VPN_THIRD_PARTY_VPN_PROVIDER_NAME}, |
{"OncVPN-Type", IDS_ONC_VPN_TYPE}, |
{"OncWiFi-Frequency", IDS_ONC_WIFI_FREQUENCY}, |
- {"OncWiFi-EAP-AnonymousIdentity", IDS_ONC_WIFI_EAP_ANONYMOUS_IDENTITY}, |
- {"OncWiFi-EAP-Identity", IDS_ONC_WIFI_EAP_IDENTITY}, |
- {"OncWiFi-EAP-Inner", IDS_ONC_WIFI_EAP_INNER}, |
- {"OncWiFi-EAP-Inner_Automatic", IDS_ONC_WIFI_EAP_INNER_AUTOMATIC}, |
- {"OncWiFi-EAP-Inner_MD5", IDS_ONC_WIFI_EAP_INNER_MD5}, |
- {"OncWiFi-EAP-Inner_MSCHAP", IDS_ONC_WIFI_EAP_INNER_MSCHAP}, |
- {"OncWiFi-EAP-Inner_MSCHAPv2", IDS_ONC_WIFI_EAP_INNER_MSCHAPV2}, |
- {"OncWiFi-EAP-Inner_PAP", IDS_ONC_WIFI_EAP_INNER_PAP}, |
- {"OncWiFi-EAP-Inner_CHAP", IDS_ONC_WIFI_EAP_INNER_CHAP}, |
- {"OncWiFi-EAP-Inner_GTC", IDS_ONC_WIFI_EAP_INNER_GTC}, |
- {"OncWiFi-EAP-Outer", IDS_ONC_WIFI_EAP_OUTER}, |
- {"OncWiFi-EAP-SubjectMatch", IDS_ONC_WIFI_EAP_SUBJECT_MATCH}, |
+ {"OncWiFi-Passphrase", IDS_ONC_WIFI_PASSWORD}, |
+ {"OncWiFi-SSID", IDS_ONC_WIFI_SSID}, |
{"OncWiFi-Security", IDS_ONC_WIFI_SECURITY}, |
+ {"OncWiFi-Security_None", IDS_ONC_WIFI_SECURITY_NONE}, |
+ {"OncWiFi-Security_WEP-PSK", IDS_ONC_WIFI_SECURITY_WEP}, |
+ {"OncWiFi-Security_WPA-EAP", IDS_ONC_WIFI_SECURITY_EAP}, |
+ {"OncWiFi-Security_WPA-PSK", IDS_ONC_WIFI_SECURITY_PSK}, |
+ {"OncWiFi-Security_WEP-8021X", IDS_ONC_WIFI_SECURITY_EAP}, |
{"OncWiFi-SignalStrength", IDS_ONC_WIFI_SIGNAL_STRENGTH}, |
{"OncWiMAX-EAP-Identity", IDS_ONC_WIMAX_EAP_IDENTITY}, |
{"Oncipv4-Gateway", IDS_ONC_IPV4_GATEWAY}, |