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

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: Rebase + Feedback 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 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 void AddInternetStrings(content::WebUIDataSource* html_source) { 868 void AddInternetStrings(content::WebUIDataSource* html_source) {
869 LocalizedString localized_strings[] = { 869 LocalizedString localized_strings[] = {
870 {"internetAddConnection", IDS_SETTINGS_INTERNET_ADD_CONNECTION}, 870 {"internetAddConnection", IDS_SETTINGS_INTERNET_ADD_CONNECTION},
871 {"internetAddConnectionExpandA11yLabel", 871 {"internetAddConnectionExpandA11yLabel",
872 IDS_SETTINGS_INTERNET_ADD_CONNECTION_EXPAND_ACCESSIBILITY_LABEL}, 872 IDS_SETTINGS_INTERNET_ADD_CONNECTION_EXPAND_ACCESSIBILITY_LABEL},
873 {"internetAddConnectionNotAllowed", 873 {"internetAddConnectionNotAllowed",
874 IDS_SETTINGS_INTERNET_ADD_CONNECTION_NOT_ALLOWED}, 874 IDS_SETTINGS_INTERNET_ADD_CONNECTION_NOT_ALLOWED},
875 {"internetAddThirdPartyVPN", IDS_SETTINGS_INTERNET_ADD_THIRD_PARTY_VPN}, 875 {"internetAddThirdPartyVPN", IDS_SETTINGS_INTERNET_ADD_THIRD_PARTY_VPN},
876 {"internetAddVPN", IDS_SETTINGS_INTERNET_ADD_VPN}, 876 {"internetAddVPN", IDS_SETTINGS_INTERNET_ADD_VPN},
877 {"internetAddWiFi", IDS_SETTINGS_INTERNET_ADD_WIFI}, 877 {"internetAddWiFi", IDS_SETTINGS_INTERNET_ADD_WIFI},
878 {"internetConfigTitle", IDS_SETTINGS_INTERNET_CONFIG},
878 {"internetDetailPageTitle", IDS_SETTINGS_INTERNET_DETAIL}, 879 {"internetDetailPageTitle", IDS_SETTINGS_INTERNET_DETAIL},
879 {"internetDeviceEnabling", IDS_SETTINGS_INTERNET_DEVICE_ENABLING}, 880 {"internetDeviceEnabling", IDS_SETTINGS_INTERNET_DEVICE_ENABLING},
880 {"internetKnownNetworksPageTitle", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS}, 881 {"internetKnownNetworksPageTitle", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS},
881 {"internetMobileSearching", IDS_SETTINGS_INTERNET_MOBILE_SEARCH}, 882 {"internetMobileSearching", IDS_SETTINGS_INTERNET_MOBILE_SEARCH},
882 {"internetNoNetworks", IDS_SETTINGS_INTERNET_NO_NETWORKS}, 883 {"internetNoNetworks", IDS_SETTINGS_INTERNET_NO_NETWORKS},
883 {"internetPageTitle", IDS_SETTINGS_INTERNET}, 884 {"internetPageTitle", IDS_SETTINGS_INTERNET},
884 {"internetToggleMobileA11yLabel", 885 {"internetToggleMobileA11yLabel",
885 IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL}, 886 IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL},
886 {"internetToggleTetherA11yLabel", 887 {"internetToggleTetherA11yLabel",
887 IDS_SETTINGS_INTERNET_TOGGLE_TETHER_ACCESSIBILITY_LABEL}, 888 IDS_SETTINGS_INTERNET_TOGGLE_TETHER_ACCESSIBILITY_LABEL},
(...skipping 15 matching lines...) Expand all
903 {"networkAllowDataRoaming", 904 {"networkAllowDataRoaming",
904 IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING}, 905 IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING},
905 {"networkAutoConnect", IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT}, 906 {"networkAutoConnect", IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT},
906 {"networkButtonActivate", IDS_SETTINGS_INTERNET_BUTTON_ACTIVATE}, 907 {"networkButtonActivate", IDS_SETTINGS_INTERNET_BUTTON_ACTIVATE},
907 {"networkButtonConfigure", IDS_SETTINGS_INTERNET_BUTTON_CONFIGURE}, 908 {"networkButtonConfigure", IDS_SETTINGS_INTERNET_BUTTON_CONFIGURE},
908 {"networkButtonConnect", IDS_SETTINGS_INTERNET_BUTTON_CONNECT}, 909 {"networkButtonConnect", IDS_SETTINGS_INTERNET_BUTTON_CONNECT},
909 {"networkButtonDisconnect", IDS_SETTINGS_INTERNET_BUTTON_DISCONNECT}, 910 {"networkButtonDisconnect", IDS_SETTINGS_INTERNET_BUTTON_DISCONNECT},
910 {"networkButtonForget", IDS_SETTINGS_INTERNET_BUTTON_FORGET}, 911 {"networkButtonForget", IDS_SETTINGS_INTERNET_BUTTON_FORGET},
911 {"networkButtonViewAccount", IDS_SETTINGS_INTERNET_BUTTON_VIEW_ACCOUNT}, 912 {"networkButtonViewAccount", IDS_SETTINGS_INTERNET_BUTTON_VIEW_ACCOUNT},
912 {"networkConnectNotAllowed", IDS_SETTINGS_INTERNET_CONNECT_NOT_ALLOWED}, 913 {"networkConnectNotAllowed", IDS_SETTINGS_INTERNET_CONNECT_NOT_ALLOWED},
914 {"networkConfigShare", IDS_SETTINGS_INTERNET_CONFIG_SHARE},
913 {"networkIPAddress", IDS_SETTINGS_INTERNET_NETWORK_IP_ADDRESS}, 915 {"networkIPAddress", IDS_SETTINGS_INTERNET_NETWORK_IP_ADDRESS},
914 {"networkIPConfigAuto", IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO}, 916 {"networkIPConfigAuto", IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO},
915 {"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER}, 917 {"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER},
916 {"networkPrimaryUserControlled", 918 {"networkPrimaryUserControlled",
917 IDS_SETTINGS_INTERNET_NETWORK_PRIMARY_USER_CONTROLLED}, 919 IDS_SETTINGS_INTERNET_NETWORK_PRIMARY_USER_CONTROLLED},
918 {"networkProxy", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PROXY}, 920 {"networkProxy", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PROXY},
919 {"networkProxyAddException", 921 {"networkProxyAddException",
920 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION}, 922 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION},
921 {"networkProxyAllowShared", 923 {"networkProxyAllowShared",
922 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED}, 924 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED},
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_BATTERY}, 1003 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_BATTERY},
1002 {"tetherConnectionDescriptionWiFi", 1004 {"tetherConnectionDescriptionWiFi",
1003 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_WIFI}, 1005 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_WIFI},
1004 {"tetherConnectionNotNowButton", 1006 {"tetherConnectionNotNowButton",
1005 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_NOT_NOW_BUTTON}, 1007 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_NOT_NOW_BUTTON},
1006 {"tetherConnectionConnectButton", 1008 {"tetherConnectionConnectButton",
1007 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CONNECT_BUTTON}, 1009 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CONNECT_BUTTON},
1008 }; 1010 };
1009 AddLocalizedStringsBulk(html_source, localized_strings, 1011 AddLocalizedStringsBulk(html_source, localized_strings,
1010 arraysize(localized_strings)); 1012 arraysize(localized_strings));
1013 html_source->AddBoolean("networkSettingsConfig",
1014 base::CommandLine::ForCurrentProcess()->HasSwitch(
1015 chromeos::switches::kNetworkSettingsConfig));
1011 } 1016 }
1012 #endif 1017 #endif
1013 1018
1014 void AddLanguagesStrings(content::WebUIDataSource* html_source) { 1019 void AddLanguagesStrings(content::WebUIDataSource* html_source) {
1015 LocalizedString localized_strings[] = { 1020 LocalizedString localized_strings[] = {
1016 {"languagesPageTitle", IDS_SETTINGS_LANGUAGES_PAGE_TITLE}, 1021 {"languagesPageTitle", IDS_SETTINGS_LANGUAGES_PAGE_TITLE},
1017 {"languagesListTitle", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_TITLE}, 1022 {"languagesListTitle", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_TITLE},
1018 {"languagesExpandA11yLabel", 1023 {"languagesExpandA11yLabel",
1019 IDS_SETTINGS_LANGUAGES_EXPAND_ACCESSIBILITY_LABEL}, 1024 IDS_SETTINGS_LANGUAGES_EXPAND_ACCESSIBILITY_LABEL},
1020 {"orderLanguagesInstructions", 1025 {"orderLanguagesInstructions",
(...skipping 967 matching lines...) Expand 10 before | Expand all | Expand 10 after
1988 {"OncCellular-RoamingState", IDS_ONC_CELLULAR_ROAMING_STATE}, 1993 {"OncCellular-RoamingState", IDS_ONC_CELLULAR_ROAMING_STATE},
1989 {"OncCellular-RoamingState_Home", IDS_ONC_CELLULAR_ROAMING_STATE_HOME}, 1994 {"OncCellular-RoamingState_Home", IDS_ONC_CELLULAR_ROAMING_STATE_HOME},
1990 {"OncCellular-RoamingState_Roaming", 1995 {"OncCellular-RoamingState_Roaming",
1991 IDS_ONC_CELLULAR_ROAMING_STATE_ROAMING}, 1996 IDS_ONC_CELLULAR_ROAMING_STATE_ROAMING},
1992 {"OncCellular-ServingOperator-Code", 1997 {"OncCellular-ServingOperator-Code",
1993 IDS_ONC_CELLULAR_SERVING_OPERATOR_CODE}, 1998 IDS_ONC_CELLULAR_SERVING_OPERATOR_CODE},
1994 {"OncCellular-ServingOperator-Name", 1999 {"OncCellular-ServingOperator-Name",
1995 IDS_ONC_CELLULAR_SERVING_OPERATOR_NAME}, 2000 IDS_ONC_CELLULAR_SERVING_OPERATOR_NAME},
1996 {"OncConnected", IDS_ONC_CONNECTED}, 2001 {"OncConnected", IDS_ONC_CONNECTED},
1997 {"OncConnecting", IDS_ONC_CONNECTING}, 2002 {"OncConnecting", IDS_ONC_CONNECTING},
2003 {"OncEAP-AnonymousIdentity", IDS_ONC_EAP_ANONYMOUS_IDENTITY},
2004 {"OncEAP-Identity", IDS_ONC_EAP_IDENTITY},
2005 {"OncEAP-Inner", IDS_ONC_EAP_INNER},
2006 {"OncEAP-Inner_Automatic", IDS_ONC_EAP_INNER_AUTOMATIC},
2007 {"OncEAP-Inner_CHAP", IDS_ONC_EAP_INNER_CHAP},
2008 {"OncEAP-Inner_GTC", IDS_ONC_EAP_INNER_GTC},
2009 {"OncEAP-Inner_MD5", IDS_ONC_EAP_INNER_MD5},
2010 {"OncEAP-Inner_MSCHAP", IDS_ONC_EAP_INNER_MSCHAP},
2011 {"OncEAP-Inner_MSCHAPv2", IDS_ONC_EAP_INNER_MSCHAPV2},
2012 {"OncEAP-Inner_PAP", IDS_ONC_EAP_INNER_PAP},
2013 {"OncEAP-Outer", IDS_ONC_EAP_OUTER},
2014 {"OncEAP-Outer_LEAP", IDS_ONC_EAP_OUTER_LEAP},
2015 {"OncEAP-Outer_PEAP", IDS_ONC_EAP_OUTER_PEAP},
2016 {"OncEAP-Outer_EAP-TLS", IDS_ONC_EAP_OUTER_TLS},
2017 {"OncEAP-Outer_EAP-TTLS", IDS_ONC_EAP_OUTER_TTLS},
2018 {"OncEAP-Password", IDS_ONC_WIFI_PASSWORD},
2019 {"OncEAP-SubjectMatch", IDS_ONC_EAP_SUBJECT_MATCH},
1998 {"OncMacAddress", IDS_ONC_MAC_ADDRESS}, 2020 {"OncMacAddress", IDS_ONC_MAC_ADDRESS},
1999 {"OncNotConnected", IDS_ONC_NOT_CONNECTED}, 2021 {"OncNotConnected", IDS_ONC_NOT_CONNECTED},
2000 {"OncRestrictedConnectivity", IDS_ONC_RESTRICTED_CONNECTIVITY}, 2022 {"OncRestrictedConnectivity", IDS_ONC_RESTRICTED_CONNECTIVITY},
2001 {"OncTether-BatteryPercentage", IDS_ONC_TETHER_BATTERY_PERCENTAGE}, 2023 {"OncTether-BatteryPercentage", IDS_ONC_TETHER_BATTERY_PERCENTAGE},
2002 {"OncTether-BatteryPercentage_Value", 2024 {"OncTether-BatteryPercentage_Value",
2003 IDS_ONC_TETHER_BATTERY_PERCENTAGE_VALUE}, 2025 IDS_ONC_TETHER_BATTERY_PERCENTAGE_VALUE},
2004 {"OncTether-SignalStrength", IDS_ONC_TETHER_SIGNAL_STRENGTH}, 2026 {"OncTether-SignalStrength", IDS_ONC_TETHER_SIGNAL_STRENGTH},
2005 {"OncTether-SignalStrength_Weak", IDS_ONC_TETHER_SIGNAL_STRENGTH_WEAK}, 2027 {"OncTether-SignalStrength_Weak", IDS_ONC_TETHER_SIGNAL_STRENGTH_WEAK},
2006 {"OncTether-SignalStrength_Okay", IDS_ONC_TETHER_SIGNAL_STRENGTH_OKAY}, 2028 {"OncTether-SignalStrength_Okay", IDS_ONC_TETHER_SIGNAL_STRENGTH_OKAY},
2007 {"OncTether-SignalStrength_Good", IDS_ONC_TETHER_SIGNAL_STRENGTH_GOOD}, 2029 {"OncTether-SignalStrength_Good", IDS_ONC_TETHER_SIGNAL_STRENGTH_GOOD},
2008 {"OncTether-SignalStrength_Strong", 2030 {"OncTether-SignalStrength_Strong",
2009 IDS_ONC_TETHER_SIGNAL_STRENGTH_STRONG}, 2031 IDS_ONC_TETHER_SIGNAL_STRENGTH_STRONG},
2010 {"OncTether-SignalStrength_VeryStrong", 2032 {"OncTether-SignalStrength_VeryStrong",
2011 IDS_ONC_TETHER_SIGNAL_STRENGTH_VERY_STRONG}, 2033 IDS_ONC_TETHER_SIGNAL_STRENGTH_VERY_STRONG},
2012 {"OncTether-Carrier", IDS_ONC_TETHER_CARRIER}, 2034 {"OncTether-Carrier", IDS_ONC_TETHER_CARRIER},
2013 {"OncTether-Carrier_Unknown", IDS_ONC_TETHER_CARRIER_UNKNOWN}, 2035 {"OncTether-Carrier_Unknown", IDS_ONC_TETHER_CARRIER_UNKNOWN},
2014 {"OncVPN-Host", IDS_ONC_VPN_HOST}, 2036 {"OncVPN-Host", IDS_ONC_VPN_HOST},
2015 {"OncVPN-L2TP-Username", IDS_ONC_VPN_L2TP_USERNAME}, 2037 {"OncVPN-L2TP-Username", IDS_ONC_VPN_L2TP_USERNAME},
2016 {"OncVPN-OpenVPN-Username", IDS_ONC_VPN_OPEN_VPN_USERNAME}, 2038 {"OncVPN-OpenVPN-Username", IDS_ONC_VPN_OPEN_VPN_USERNAME},
2017 {"OncVPN-ThirdPartyVPN-ProviderName", 2039 {"OncVPN-ThirdPartyVPN-ProviderName",
2018 IDS_ONC_VPN_THIRD_PARTY_VPN_PROVIDER_NAME}, 2040 IDS_ONC_VPN_THIRD_PARTY_VPN_PROVIDER_NAME},
2019 {"OncVPN-Type", IDS_ONC_VPN_TYPE}, 2041 {"OncVPN-Type", IDS_ONC_VPN_TYPE},
2020 {"OncWiFi-Frequency", IDS_ONC_WIFI_FREQUENCY}, 2042 {"OncWiFi-Frequency", IDS_ONC_WIFI_FREQUENCY},
2021 {"OncWiFi-EAP-AnonymousIdentity", IDS_ONC_WIFI_EAP_ANONYMOUS_IDENTITY}, 2043 {"OncWiFi-Passphrase", IDS_ONC_WIFI_PASSWORD},
2022 {"OncWiFi-EAP-Identity", IDS_ONC_WIFI_EAP_IDENTITY}, 2044 {"OncWiFi-SSID", IDS_ONC_WIFI_SSID},
2023 {"OncWiFi-EAP-Inner", IDS_ONC_WIFI_EAP_INNER},
2024 {"OncWiFi-EAP-Inner_Automatic", IDS_ONC_WIFI_EAP_INNER_AUTOMATIC},
2025 {"OncWiFi-EAP-Inner_MD5", IDS_ONC_WIFI_EAP_INNER_MD5},
2026 {"OncWiFi-EAP-Inner_MSCHAP", IDS_ONC_WIFI_EAP_INNER_MSCHAP},
2027 {"OncWiFi-EAP-Inner_MSCHAPv2", IDS_ONC_WIFI_EAP_INNER_MSCHAPV2},
2028 {"OncWiFi-EAP-Inner_PAP", IDS_ONC_WIFI_EAP_INNER_PAP},
2029 {"OncWiFi-EAP-Inner_CHAP", IDS_ONC_WIFI_EAP_INNER_CHAP},
2030 {"OncWiFi-EAP-Inner_GTC", IDS_ONC_WIFI_EAP_INNER_GTC},
2031 {"OncWiFi-EAP-Outer", IDS_ONC_WIFI_EAP_OUTER},
2032 {"OncWiFi-EAP-SubjectMatch", IDS_ONC_WIFI_EAP_SUBJECT_MATCH},
2033 {"OncWiFi-Security", IDS_ONC_WIFI_SECURITY}, 2045 {"OncWiFi-Security", IDS_ONC_WIFI_SECURITY},
2046 {"OncWiFi-Security_None", IDS_ONC_WIFI_SECURITY_NONE},
2047 {"OncWiFi-Security_WEP-PSK", IDS_ONC_WIFI_SECURITY_WEP},
2048 {"OncWiFi-Security_WPA-EAP", IDS_ONC_WIFI_SECURITY_EAP},
2049 {"OncWiFi-Security_WPA-PSK", IDS_ONC_WIFI_SECURITY_PSK},
2050 {"OncWiFi-Security_WEP-8021X", IDS_ONC_WIFI_SECURITY_EAP},
2034 {"OncWiFi-SignalStrength", IDS_ONC_WIFI_SIGNAL_STRENGTH}, 2051 {"OncWiFi-SignalStrength", IDS_ONC_WIFI_SIGNAL_STRENGTH},
2035 {"OncWiMAX-EAP-Identity", IDS_ONC_WIMAX_EAP_IDENTITY}, 2052 {"OncWiMAX-EAP-Identity", IDS_ONC_WIMAX_EAP_IDENTITY},
2036 {"Oncipv4-Gateway", IDS_ONC_IPV4_GATEWAY}, 2053 {"Oncipv4-Gateway", IDS_ONC_IPV4_GATEWAY},
2037 {"Oncipv4-IPAddress", IDS_ONC_IPV4_ADDRESS}, 2054 {"Oncipv4-IPAddress", IDS_ONC_IPV4_ADDRESS},
2038 {"Oncipv4-RoutingPrefix", IDS_ONC_IPV4_ROUTING_PREFIX}, 2055 {"Oncipv4-RoutingPrefix", IDS_ONC_IPV4_ROUTING_PREFIX},
2039 {"Oncipv6-IPAddress", IDS_ONC_IPV6_ADDRESS}, 2056 {"Oncipv6-IPAddress", IDS_ONC_IPV6_ADDRESS},
2040 }; 2057 };
2041 AddLocalizedStringsBulk(html_source, onc_property_strings, 2058 AddLocalizedStringsBulk(html_source, onc_property_strings,
2042 arraysize(onc_property_strings)); 2059 arraysize(onc_property_strings));
2043 } 2060 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
2089 2106
2090 #if defined(OS_CHROMEOS) 2107 #if defined(OS_CHROMEOS)
2091 chromeos::network_element::AddLocalizedStrings(html_source); 2108 chromeos::network_element::AddLocalizedStrings(html_source);
2092 #endif 2109 #endif
2093 policy_indicator::AddLocalizedStrings(html_source); 2110 policy_indicator::AddLocalizedStrings(html_source);
2094 2111
2095 html_source->SetJsonPath(kLocalizedStringsFile); 2112 html_source->SetJsonPath(kLocalizedStringsFile);
2096 } 2113 }
2097 2114
2098 } // namespace settings 2115 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698