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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2848683003: MD Settings: Add settings-internet-config (WiFi only, no certs) (Closed)
Patch Set: Feedback, add network-confg-input + select Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after
864 void AddInternetStrings(content::WebUIDataSource* html_source) { 864 void AddInternetStrings(content::WebUIDataSource* html_source) {
865 LocalizedString localized_strings[] = { 865 LocalizedString localized_strings[] = {
866 {"internetAddConnection", IDS_SETTINGS_INTERNET_ADD_CONNECTION}, 866 {"internetAddConnection", IDS_SETTINGS_INTERNET_ADD_CONNECTION},
867 {"internetAddConnectionExpandA11yLabel", 867 {"internetAddConnectionExpandA11yLabel",
868 IDS_SETTINGS_INTERNET_ADD_CONNECTION_EXPAND_ACCESSIBILITY_LABEL}, 868 IDS_SETTINGS_INTERNET_ADD_CONNECTION_EXPAND_ACCESSIBILITY_LABEL},
869 {"internetAddConnectionNotAllowed", 869 {"internetAddConnectionNotAllowed",
870 IDS_SETTINGS_INTERNET_ADD_CONNECTION_NOT_ALLOWED}, 870 IDS_SETTINGS_INTERNET_ADD_CONNECTION_NOT_ALLOWED},
871 {"internetAddThirdPartyVPN", IDS_SETTINGS_INTERNET_ADD_THIRD_PARTY_VPN}, 871 {"internetAddThirdPartyVPN", IDS_SETTINGS_INTERNET_ADD_THIRD_PARTY_VPN},
872 {"internetAddVPN", IDS_SETTINGS_INTERNET_ADD_VPN}, 872 {"internetAddVPN", IDS_SETTINGS_INTERNET_ADD_VPN},
873 {"internetAddWiFi", IDS_SETTINGS_INTERNET_ADD_WIFI}, 873 {"internetAddWiFi", IDS_SETTINGS_INTERNET_ADD_WIFI},
874 {"internetConfigTitle", IDS_SETTINGS_INTERNET_CONFIG},
874 {"internetDetailPageTitle", IDS_SETTINGS_INTERNET_DETAIL}, 875 {"internetDetailPageTitle", IDS_SETTINGS_INTERNET_DETAIL},
875 {"internetDeviceEnabling", IDS_SETTINGS_INTERNET_DEVICE_ENABLING}, 876 {"internetDeviceEnabling", IDS_SETTINGS_INTERNET_DEVICE_ENABLING},
876 {"internetKnownNetworksPageTitle", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS}, 877 {"internetKnownNetworksPageTitle", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS},
877 {"internetMobileSearching", IDS_SETTINGS_INTERNET_MOBILE_SEARCH}, 878 {"internetMobileSearching", IDS_SETTINGS_INTERNET_MOBILE_SEARCH},
878 {"internetNoNetworks", IDS_SETTINGS_INTERNET_NO_NETWORKS}, 879 {"internetNoNetworks", IDS_SETTINGS_INTERNET_NO_NETWORKS},
879 {"internetPageTitle", IDS_SETTINGS_INTERNET}, 880 {"internetPageTitle", IDS_SETTINGS_INTERNET},
880 {"internetToggleMobileA11yLabel", 881 {"internetToggleMobileA11yLabel",
881 IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL}, 882 IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL},
882 {"internetToggleTetherA11yLabel", 883 {"internetToggleTetherA11yLabel",
883 IDS_SETTINGS_INTERNET_TOGGLE_TETHER_ACCESSIBILITY_LABEL}, 884 IDS_SETTINGS_INTERNET_TOGGLE_TETHER_ACCESSIBILITY_LABEL},
(...skipping 15 matching lines...) Expand all
899 {"networkAllowDataRoaming", 900 {"networkAllowDataRoaming",
900 IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING}, 901 IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING},
901 {"networkAutoConnect", IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT}, 902 {"networkAutoConnect", IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT},
902 {"networkButtonActivate", IDS_SETTINGS_INTERNET_BUTTON_ACTIVATE}, 903 {"networkButtonActivate", IDS_SETTINGS_INTERNET_BUTTON_ACTIVATE},
903 {"networkButtonConfigure", IDS_SETTINGS_INTERNET_BUTTON_CONFIGURE}, 904 {"networkButtonConfigure", IDS_SETTINGS_INTERNET_BUTTON_CONFIGURE},
904 {"networkButtonConnect", IDS_SETTINGS_INTERNET_BUTTON_CONNECT}, 905 {"networkButtonConnect", IDS_SETTINGS_INTERNET_BUTTON_CONNECT},
905 {"networkButtonDisconnect", IDS_SETTINGS_INTERNET_BUTTON_DISCONNECT}, 906 {"networkButtonDisconnect", IDS_SETTINGS_INTERNET_BUTTON_DISCONNECT},
906 {"networkButtonForget", IDS_SETTINGS_INTERNET_BUTTON_FORGET}, 907 {"networkButtonForget", IDS_SETTINGS_INTERNET_BUTTON_FORGET},
907 {"networkButtonViewAccount", IDS_SETTINGS_INTERNET_BUTTON_VIEW_ACCOUNT}, 908 {"networkButtonViewAccount", IDS_SETTINGS_INTERNET_BUTTON_VIEW_ACCOUNT},
908 {"networkConnectNotAllowed", IDS_SETTINGS_INTERNET_CONNECT_NOT_ALLOWED}, 909 {"networkConnectNotAllowed", IDS_SETTINGS_INTERNET_CONNECT_NOT_ALLOWED},
910 {"networkConfigShare", IDS_SETTINGS_INTERNET_CONFIG_SHARE},
909 {"networkIPAddress", IDS_SETTINGS_INTERNET_NETWORK_IP_ADDRESS}, 911 {"networkIPAddress", IDS_SETTINGS_INTERNET_NETWORK_IP_ADDRESS},
910 {"networkIPConfigAuto", IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO}, 912 {"networkIPConfigAuto", IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO},
911 {"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER}, 913 {"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER},
912 {"networkPrimaryUserControlled", 914 {"networkPrimaryUserControlled",
913 IDS_SETTINGS_INTERNET_NETWORK_PRIMARY_USER_CONTROLLED}, 915 IDS_SETTINGS_INTERNET_NETWORK_PRIMARY_USER_CONTROLLED},
914 {"networkProxy", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PROXY}, 916 {"networkProxy", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PROXY},
915 {"networkProxyAddException", 917 {"networkProxyAddException",
916 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION}, 918 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION},
917 {"networkProxyAllowShared", 919 {"networkProxyAllowShared",
918 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED}, 920 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED},
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_BATTERY}, 999 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_BATTERY},
998 {"tetherConnectionDescriptionWiFi", 1000 {"tetherConnectionDescriptionWiFi",
999 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_WIFI}, 1001 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_WIFI},
1000 {"tetherConnectionNotNowButton", 1002 {"tetherConnectionNotNowButton",
1001 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_NOT_NOW_BUTTON}, 1003 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_NOT_NOW_BUTTON},
1002 {"tetherConnectionConnectButton", 1004 {"tetherConnectionConnectButton",
1003 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CONNECT_BUTTON}, 1005 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CONNECT_BUTTON},
1004 }; 1006 };
1005 AddLocalizedStringsBulk(html_source, localized_strings, 1007 AddLocalizedStringsBulk(html_source, localized_strings,
1006 arraysize(localized_strings)); 1008 arraysize(localized_strings));
1009 html_source->AddBoolean("networkSettingsConfig",
1010 base::CommandLine::ForCurrentProcess()->HasSwitch(
1011 chromeos::switches::kNetworkSettingsConfig));
1007 } 1012 }
1008 #endif 1013 #endif
1009 1014
1010 void AddLanguagesStrings(content::WebUIDataSource* html_source) { 1015 void AddLanguagesStrings(content::WebUIDataSource* html_source) {
1011 LocalizedString localized_strings[] = { 1016 LocalizedString localized_strings[] = {
1012 {"languagesPageTitle", IDS_SETTINGS_LANGUAGES_PAGE_TITLE}, 1017 {"languagesPageTitle", IDS_SETTINGS_LANGUAGES_PAGE_TITLE},
1013 {"languagesListTitle", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_TITLE}, 1018 {"languagesListTitle", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_TITLE},
1014 {"languagesExpandA11yLabel", 1019 {"languagesExpandA11yLabel",
1015 IDS_SETTINGS_LANGUAGES_EXPAND_ACCESSIBILITY_LABEL}, 1020 IDS_SETTINGS_LANGUAGES_EXPAND_ACCESSIBILITY_LABEL},
1016 {"orderLanguagesInstructions", 1021 {"orderLanguagesInstructions",
(...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after
1983 {"OncCellular-RoamingState", IDS_ONC_CELLULAR_ROAMING_STATE}, 1988 {"OncCellular-RoamingState", IDS_ONC_CELLULAR_ROAMING_STATE},
1984 {"OncCellular-RoamingState_Home", IDS_ONC_CELLULAR_ROAMING_STATE_HOME}, 1989 {"OncCellular-RoamingState_Home", IDS_ONC_CELLULAR_ROAMING_STATE_HOME},
1985 {"OncCellular-RoamingState_Roaming", 1990 {"OncCellular-RoamingState_Roaming",
1986 IDS_ONC_CELLULAR_ROAMING_STATE_ROAMING}, 1991 IDS_ONC_CELLULAR_ROAMING_STATE_ROAMING},
1987 {"OncCellular-ServingOperator-Code", 1992 {"OncCellular-ServingOperator-Code",
1988 IDS_ONC_CELLULAR_SERVING_OPERATOR_CODE}, 1993 IDS_ONC_CELLULAR_SERVING_OPERATOR_CODE},
1989 {"OncCellular-ServingOperator-Name", 1994 {"OncCellular-ServingOperator-Name",
1990 IDS_ONC_CELLULAR_SERVING_OPERATOR_NAME}, 1995 IDS_ONC_CELLULAR_SERVING_OPERATOR_NAME},
1991 {"OncConnected", IDS_ONC_CONNECTED}, 1996 {"OncConnected", IDS_ONC_CONNECTED},
1992 {"OncConnecting", IDS_ONC_CONNECTING}, 1997 {"OncConnecting", IDS_ONC_CONNECTING},
1998 {"OncEAP-AnonymousIdentity", IDS_ONC_EAP_ANONYMOUS_IDENTITY},
1999 {"OncEAP-Identity", IDS_ONC_EAP_IDENTITY},
2000 {"OncEAP-Inner", IDS_ONC_EAP_INNER},
2001 {"OncEAP-Inner_Automatic", IDS_ONC_EAP_INNER_AUTOMATIC},
2002 {"OncEAP-Inner_CHAP", IDS_ONC_EAP_INNER_CHAP},
2003 {"OncEAP-Inner_GTC", IDS_ONC_EAP_INNER_GTC},
2004 {"OncEAP-Inner_MD5", IDS_ONC_EAP_INNER_MD5},
2005 {"OncEAP-Inner_MSCHAP", IDS_ONC_EAP_INNER_MSCHAP},
2006 {"OncEAP-Inner_MSCHAPv2", IDS_ONC_EAP_INNER_MSCHAPV2},
2007 {"OncEAP-Inner_PAP", IDS_ONC_EAP_INNER_PAP},
2008 {"OncEAP-Outer", IDS_ONC_EAP_OUTER},
2009 {"OncEAP-Outer_LEAP", IDS_ONC_EAP_OUTER_LEAP},
2010 {"OncEAP-Outer_PEAP", IDS_ONC_EAP_OUTER_PEAP},
2011 {"OncEAP-Outer_EAP-TLS", IDS_ONC_EAP_OUTER_TLS},
2012 {"OncEAP-Outer_EAP-TTLS", IDS_ONC_EAP_OUTER_TTLS},
2013 {"OncEAP-Password", IDS_ONC_WIFI_PASSWORD},
2014 {"OncEAP-SubjectMatch", IDS_ONC_EAP_SUBJECT_MATCH},
1993 {"OncMacAddress", IDS_ONC_MAC_ADDRESS}, 2015 {"OncMacAddress", IDS_ONC_MAC_ADDRESS},
1994 {"OncNotConnected", IDS_ONC_NOT_CONNECTED}, 2016 {"OncNotConnected", IDS_ONC_NOT_CONNECTED},
1995 {"OncRestrictedConnectivity", IDS_ONC_RESTRICTED_CONNECTIVITY}, 2017 {"OncRestrictedConnectivity", IDS_ONC_RESTRICTED_CONNECTIVITY},
1996 {"OncTether-BatteryPercentage", IDS_ONC_TETHER_BATTERY_PERCENTAGE}, 2018 {"OncTether-BatteryPercentage", IDS_ONC_TETHER_BATTERY_PERCENTAGE},
1997 {"OncTether-BatteryPercentage_Value", 2019 {"OncTether-BatteryPercentage_Value",
1998 IDS_ONC_TETHER_BATTERY_PERCENTAGE_VALUE}, 2020 IDS_ONC_TETHER_BATTERY_PERCENTAGE_VALUE},
1999 {"OncTether-SignalStrength", IDS_ONC_TETHER_SIGNAL_STRENGTH}, 2021 {"OncTether-SignalStrength", IDS_ONC_TETHER_SIGNAL_STRENGTH},
2000 {"OncTether-SignalStrength_Weak", IDS_ONC_TETHER_SIGNAL_STRENGTH_WEAK}, 2022 {"OncTether-SignalStrength_Weak", IDS_ONC_TETHER_SIGNAL_STRENGTH_WEAK},
2001 {"OncTether-SignalStrength_Okay", IDS_ONC_TETHER_SIGNAL_STRENGTH_OKAY}, 2023 {"OncTether-SignalStrength_Okay", IDS_ONC_TETHER_SIGNAL_STRENGTH_OKAY},
2002 {"OncTether-SignalStrength_Good", IDS_ONC_TETHER_SIGNAL_STRENGTH_GOOD}, 2024 {"OncTether-SignalStrength_Good", IDS_ONC_TETHER_SIGNAL_STRENGTH_GOOD},
2003 {"OncTether-SignalStrength_Strong", 2025 {"OncTether-SignalStrength_Strong",
2004 IDS_ONC_TETHER_SIGNAL_STRENGTH_STRONG}, 2026 IDS_ONC_TETHER_SIGNAL_STRENGTH_STRONG},
2005 {"OncTether-SignalStrength_VeryStrong", 2027 {"OncTether-SignalStrength_VeryStrong",
2006 IDS_ONC_TETHER_SIGNAL_STRENGTH_VERY_STRONG}, 2028 IDS_ONC_TETHER_SIGNAL_STRENGTH_VERY_STRONG},
2007 {"OncTether-Carrier", IDS_ONC_TETHER_CARRIER}, 2029 {"OncTether-Carrier", IDS_ONC_TETHER_CARRIER},
2008 {"OncTether-Carrier_Unknown", IDS_ONC_TETHER_CARRIER_UNKNOWN}, 2030 {"OncTether-Carrier_Unknown", IDS_ONC_TETHER_CARRIER_UNKNOWN},
2009 {"OncVPN-Host", IDS_ONC_VPN_HOST}, 2031 {"OncVPN-Host", IDS_ONC_VPN_HOST},
2010 {"OncVPN-L2TP-Username", IDS_ONC_VPN_L2TP_USERNAME}, 2032 {"OncVPN-L2TP-Username", IDS_ONC_VPN_L2TP_USERNAME},
2011 {"OncVPN-OpenVPN-Username", IDS_ONC_VPN_OPEN_VPN_USERNAME}, 2033 {"OncVPN-OpenVPN-Username", IDS_ONC_VPN_OPEN_VPN_USERNAME},
2012 {"OncVPN-ThirdPartyVPN-ProviderName", 2034 {"OncVPN-ThirdPartyVPN-ProviderName",
2013 IDS_ONC_VPN_THIRD_PARTY_VPN_PROVIDER_NAME}, 2035 IDS_ONC_VPN_THIRD_PARTY_VPN_PROVIDER_NAME},
2014 {"OncVPN-Type", IDS_ONC_VPN_TYPE}, 2036 {"OncVPN-Type", IDS_ONC_VPN_TYPE},
2015 {"OncWiFi-Frequency", IDS_ONC_WIFI_FREQUENCY}, 2037 {"OncWiFi-Frequency", IDS_ONC_WIFI_FREQUENCY},
2016 {"OncWiFi-EAP-AnonymousIdentity", IDS_ONC_WIFI_EAP_ANONYMOUS_IDENTITY}, 2038 {"OncWiFi-Passphrase", IDS_ONC_WIFI_PASSWORD},
2017 {"OncWiFi-EAP-Identity", IDS_ONC_WIFI_EAP_IDENTITY}, 2039 {"OncWiFi-SSID", IDS_ONC_WIFI_SSID},
2018 {"OncWiFi-EAP-Inner", IDS_ONC_WIFI_EAP_INNER},
2019 {"OncWiFi-EAP-Inner_Automatic", IDS_ONC_WIFI_EAP_INNER_AUTOMATIC},
2020 {"OncWiFi-EAP-Inner_MD5", IDS_ONC_WIFI_EAP_INNER_MD5},
2021 {"OncWiFi-EAP-Inner_MSCHAP", IDS_ONC_WIFI_EAP_INNER_MSCHAP},
2022 {"OncWiFi-EAP-Inner_MSCHAPv2", IDS_ONC_WIFI_EAP_INNER_MSCHAPV2},
2023 {"OncWiFi-EAP-Inner_PAP", IDS_ONC_WIFI_EAP_INNER_PAP},
2024 {"OncWiFi-EAP-Inner_CHAP", IDS_ONC_WIFI_EAP_INNER_CHAP},
2025 {"OncWiFi-EAP-Inner_GTC", IDS_ONC_WIFI_EAP_INNER_GTC},
2026 {"OncWiFi-EAP-Outer", IDS_ONC_WIFI_EAP_OUTER},
2027 {"OncWiFi-EAP-SubjectMatch", IDS_ONC_WIFI_EAP_SUBJECT_MATCH},
2028 {"OncWiFi-Security", IDS_ONC_WIFI_SECURITY}, 2040 {"OncWiFi-Security", IDS_ONC_WIFI_SECURITY},
2041 {"OncWiFi-Security_None", IDS_ONC_WIFI_SECURITY_NONE},
2042 {"OncWiFi-Security_WEP-PSK", IDS_ONC_WIFI_SECURITY_WEP},
2043 {"OncWiFi-Security_WPA-EAP", IDS_ONC_WIFI_SECURITY_EAP},
2044 {"OncWiFi-Security_WPA-PSK", IDS_ONC_WIFI_SECURITY_PSK},
2045 {"OncWiFi-Security_WEP-8021X", IDS_ONC_WIFI_SECURITY_EAP},
2029 {"OncWiFi-SignalStrength", IDS_ONC_WIFI_SIGNAL_STRENGTH}, 2046 {"OncWiFi-SignalStrength", IDS_ONC_WIFI_SIGNAL_STRENGTH},
2030 {"OncWiMAX-EAP-Identity", IDS_ONC_WIMAX_EAP_IDENTITY}, 2047 {"OncWiMAX-EAP-Identity", IDS_ONC_WIMAX_EAP_IDENTITY},
2031 {"Oncipv4-Gateway", IDS_ONC_IPV4_GATEWAY}, 2048 {"Oncipv4-Gateway", IDS_ONC_IPV4_GATEWAY},
2032 {"Oncipv4-IPAddress", IDS_ONC_IPV4_ADDRESS}, 2049 {"Oncipv4-IPAddress", IDS_ONC_IPV4_ADDRESS},
2033 {"Oncipv4-RoutingPrefix", IDS_ONC_IPV4_ROUTING_PREFIX}, 2050 {"Oncipv4-RoutingPrefix", IDS_ONC_IPV4_ROUTING_PREFIX},
2034 {"Oncipv6-IPAddress", IDS_ONC_IPV6_ADDRESS}, 2051 {"Oncipv6-IPAddress", IDS_ONC_IPV6_ADDRESS},
2035 }; 2052 };
2036 AddLocalizedStringsBulk(html_source, onc_property_strings, 2053 AddLocalizedStringsBulk(html_source, onc_property_strings,
2037 arraysize(onc_property_strings)); 2054 arraysize(onc_property_strings));
2038 } 2055 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
2084 2101
2085 #if defined(OS_CHROMEOS) 2102 #if defined(OS_CHROMEOS)
2086 chromeos::network_element::AddLocalizedStrings(html_source); 2103 chromeos::network_element::AddLocalizedStrings(html_source);
2087 #endif 2104 #endif
2088 policy_indicator::AddLocalizedStrings(html_source); 2105 policy_indicator::AddLocalizedStrings(html_source);
2089 2106
2090 html_source->SetJsonPath(kLocalizedStringsFile); 2107 html_source->SetJsonPath(kLocalizedStringsFile);
2091 } 2108 }
2092 2109
2093 } // namespace settings 2110 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698