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 77d38034c83704c24222d3eb9d0c1ba72e19c82d..b8ec59c54c22cff430153ff2c49b1d6919c1eb21 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 |
@@ -869,6 +869,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}, |
@@ -904,6 +905,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}, |
@@ -1002,6 +1004,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 |
@@ -2018,8 +2023,15 @@ void AddOncStrings(content::WebUIDataSource* html_source) { |
{"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-Password", IDS_ONC_WIFI_PASSWORD}, |
{"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", IDS_ONC_WIFI_SECURITY_WEP}, |
+ {"OncWiFi-Security_PSK", IDS_ONC_WIFI_SECURITY_PSK}, |
+ {"OncWiFi-Security_EAP", 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}, |