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

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: . 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 851 matching lines...) Expand 10 before | Expand all | Expand 10 after
862 void AddInternetStrings(content::WebUIDataSource* html_source) { 862 void AddInternetStrings(content::WebUIDataSource* html_source) {
863 LocalizedString localized_strings[] = { 863 LocalizedString localized_strings[] = {
864 {"internetAddConnection", IDS_SETTINGS_INTERNET_ADD_CONNECTION}, 864 {"internetAddConnection", IDS_SETTINGS_INTERNET_ADD_CONNECTION},
865 {"internetAddConnectionExpandA11yLabel", 865 {"internetAddConnectionExpandA11yLabel",
866 IDS_SETTINGS_INTERNET_ADD_CONNECTION_EXPAND_ACCESSIBILITY_LABEL}, 866 IDS_SETTINGS_INTERNET_ADD_CONNECTION_EXPAND_ACCESSIBILITY_LABEL},
867 {"internetAddConnectionNotAllowed", 867 {"internetAddConnectionNotAllowed",
868 IDS_SETTINGS_INTERNET_ADD_CONNECTION_NOT_ALLOWED}, 868 IDS_SETTINGS_INTERNET_ADD_CONNECTION_NOT_ALLOWED},
869 {"internetAddThirdPartyVPN", IDS_SETTINGS_INTERNET_ADD_THIRD_PARTY_VPN}, 869 {"internetAddThirdPartyVPN", IDS_SETTINGS_INTERNET_ADD_THIRD_PARTY_VPN},
870 {"internetAddVPN", IDS_SETTINGS_INTERNET_ADD_VPN}, 870 {"internetAddVPN", IDS_SETTINGS_INTERNET_ADD_VPN},
871 {"internetAddWiFi", IDS_SETTINGS_INTERNET_ADD_WIFI}, 871 {"internetAddWiFi", IDS_SETTINGS_INTERNET_ADD_WIFI},
872 {"internetConfigTitle", IDS_SETTINGS_INTERNET_CONFIG},
872 {"internetDetailPageTitle", IDS_SETTINGS_INTERNET_DETAIL}, 873 {"internetDetailPageTitle", IDS_SETTINGS_INTERNET_DETAIL},
873 {"internetDeviceEnabling", IDS_SETTINGS_INTERNET_DEVICE_ENABLING}, 874 {"internetDeviceEnabling", IDS_SETTINGS_INTERNET_DEVICE_ENABLING},
874 {"internetKnownNetworksPageTitle", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS}, 875 {"internetKnownNetworksPageTitle", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS},
875 {"internetMobileSearching", IDS_SETTINGS_INTERNET_MOBILE_SEARCH}, 876 {"internetMobileSearching", IDS_SETTINGS_INTERNET_MOBILE_SEARCH},
876 {"internetNoNetworks", IDS_SETTINGS_INTERNET_NO_NETWORKS}, 877 {"internetNoNetworks", IDS_SETTINGS_INTERNET_NO_NETWORKS},
877 {"internetPageTitle", IDS_SETTINGS_INTERNET}, 878 {"internetPageTitle", IDS_SETTINGS_INTERNET},
878 {"internetToggleMobileA11yLabel", 879 {"internetToggleMobileA11yLabel",
879 IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL}, 880 IDS_SETTINGS_INTERNET_TOGGLE_MOBILE_ACCESSIBILITY_LABEL},
880 {"internetToggleTetherA11yLabel", 881 {"internetToggleTetherA11yLabel",
881 IDS_SETTINGS_INTERNET_TOGGLE_TETHER_ACCESSIBILITY_LABEL}, 882 IDS_SETTINGS_INTERNET_TOGGLE_TETHER_ACCESSIBILITY_LABEL},
(...skipping 15 matching lines...) Expand all
897 {"networkAllowDataRoaming", 898 {"networkAllowDataRoaming",
898 IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING}, 899 IDS_SETTINGS_SETTINGS_NETWORK_ALLOW_DATA_ROAMING},
899 {"networkAutoConnect", IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT}, 900 {"networkAutoConnect", IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT},
900 {"networkButtonActivate", IDS_SETTINGS_INTERNET_BUTTON_ACTIVATE}, 901 {"networkButtonActivate", IDS_SETTINGS_INTERNET_BUTTON_ACTIVATE},
901 {"networkButtonConfigure", IDS_SETTINGS_INTERNET_BUTTON_CONFIGURE}, 902 {"networkButtonConfigure", IDS_SETTINGS_INTERNET_BUTTON_CONFIGURE},
902 {"networkButtonConnect", IDS_SETTINGS_INTERNET_BUTTON_CONNECT}, 903 {"networkButtonConnect", IDS_SETTINGS_INTERNET_BUTTON_CONNECT},
903 {"networkButtonDisconnect", IDS_SETTINGS_INTERNET_BUTTON_DISCONNECT}, 904 {"networkButtonDisconnect", IDS_SETTINGS_INTERNET_BUTTON_DISCONNECT},
904 {"networkButtonForget", IDS_SETTINGS_INTERNET_BUTTON_FORGET}, 905 {"networkButtonForget", IDS_SETTINGS_INTERNET_BUTTON_FORGET},
905 {"networkButtonViewAccount", IDS_SETTINGS_INTERNET_BUTTON_VIEW_ACCOUNT}, 906 {"networkButtonViewAccount", IDS_SETTINGS_INTERNET_BUTTON_VIEW_ACCOUNT},
906 {"networkConnectNotAllowed", IDS_SETTINGS_INTERNET_CONNECT_NOT_ALLOWED}, 907 {"networkConnectNotAllowed", IDS_SETTINGS_INTERNET_CONNECT_NOT_ALLOWED},
908 {"networkConfigShare", IDS_SETTINGS_INTERNET_CONFIG_SHARE},
907 {"networkIPAddress", IDS_SETTINGS_INTERNET_NETWORK_IP_ADDRESS}, 909 {"networkIPAddress", IDS_SETTINGS_INTERNET_NETWORK_IP_ADDRESS},
908 {"networkIPConfigAuto", IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO}, 910 {"networkIPConfigAuto", IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO},
909 {"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER}, 911 {"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER},
910 {"networkPrimaryUserControlled", 912 {"networkPrimaryUserControlled",
911 IDS_SETTINGS_INTERNET_NETWORK_PRIMARY_USER_CONTROLLED}, 913 IDS_SETTINGS_INTERNET_NETWORK_PRIMARY_USER_CONTROLLED},
912 {"networkProxy", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PROXY}, 914 {"networkProxy", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PROXY},
913 {"networkProxyAddException", 915 {"networkProxyAddException",
914 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION}, 916 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION},
915 {"networkProxyAllowShared", 917 {"networkProxyAllowShared",
916 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED}, 918 IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED},
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
995 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_BATTERY}, 997 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_BATTERY},
996 {"tetherConnectionDescriptionWiFi", 998 {"tetherConnectionDescriptionWiFi",
997 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_WIFI}, 999 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_DESCRIPTION_WIFI},
998 {"tetherConnectionNotNowButton", 1000 {"tetherConnectionNotNowButton",
999 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_NOT_NOW_BUTTON}, 1001 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_NOT_NOW_BUTTON},
1000 {"tetherConnectionConnectButton", 1002 {"tetherConnectionConnectButton",
1001 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CONNECT_BUTTON}, 1003 IDS_SETTINGS_INTERNET_TETHER_CONNECTION_CONNECT_BUTTON},
1002 }; 1004 };
1003 AddLocalizedStringsBulk(html_source, localized_strings, 1005 AddLocalizedStringsBulk(html_source, localized_strings,
1004 arraysize(localized_strings)); 1006 arraysize(localized_strings));
1007 html_source->AddBoolean("networkSettingsConfig",
1008 base::CommandLine::ForCurrentProcess()->HasSwitch(
1009 chromeos::switches::kNetworkSettingsConfig));
1005 } 1010 }
1006 #endif 1011 #endif
1007 1012
1008 void AddLanguagesStrings(content::WebUIDataSource* html_source) { 1013 void AddLanguagesStrings(content::WebUIDataSource* html_source) {
1009 LocalizedString localized_strings[] = { 1014 LocalizedString localized_strings[] = {
1010 {"languagesPageTitle", IDS_SETTINGS_LANGUAGES_PAGE_TITLE}, 1015 {"languagesPageTitle", IDS_SETTINGS_LANGUAGES_PAGE_TITLE},
1011 {"languagesListTitle", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_TITLE}, 1016 {"languagesListTitle", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_TITLE},
1012 {"languagesExpandA11yLabel", 1017 {"languagesExpandA11yLabel",
1013 IDS_SETTINGS_LANGUAGES_EXPAND_ACCESSIBILITY_LABEL}, 1018 IDS_SETTINGS_LANGUAGES_EXPAND_ACCESSIBILITY_LABEL},
1014 {"orderLanguagesInstructions", 1019 {"orderLanguagesInstructions",
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after
2011 {"OncWiFi-EAP-Identity", IDS_ONC_WIFI_EAP_IDENTITY}, 2016 {"OncWiFi-EAP-Identity", IDS_ONC_WIFI_EAP_IDENTITY},
2012 {"OncWiFi-EAP-Inner", IDS_ONC_WIFI_EAP_INNER}, 2017 {"OncWiFi-EAP-Inner", IDS_ONC_WIFI_EAP_INNER},
2013 {"OncWiFi-EAP-Inner_Automatic", IDS_ONC_WIFI_EAP_INNER_AUTOMATIC}, 2018 {"OncWiFi-EAP-Inner_Automatic", IDS_ONC_WIFI_EAP_INNER_AUTOMATIC},
2014 {"OncWiFi-EAP-Inner_MD5", IDS_ONC_WIFI_EAP_INNER_MD5}, 2019 {"OncWiFi-EAP-Inner_MD5", IDS_ONC_WIFI_EAP_INNER_MD5},
2015 {"OncWiFi-EAP-Inner_MSCHAP", IDS_ONC_WIFI_EAP_INNER_MSCHAP}, 2020 {"OncWiFi-EAP-Inner_MSCHAP", IDS_ONC_WIFI_EAP_INNER_MSCHAP},
2016 {"OncWiFi-EAP-Inner_MSCHAPv2", IDS_ONC_WIFI_EAP_INNER_MSCHAPV2}, 2021 {"OncWiFi-EAP-Inner_MSCHAPv2", IDS_ONC_WIFI_EAP_INNER_MSCHAPV2},
2017 {"OncWiFi-EAP-Inner_PAP", IDS_ONC_WIFI_EAP_INNER_PAP}, 2022 {"OncWiFi-EAP-Inner_PAP", IDS_ONC_WIFI_EAP_INNER_PAP},
2018 {"OncWiFi-EAP-Inner_CHAP", IDS_ONC_WIFI_EAP_INNER_CHAP}, 2023 {"OncWiFi-EAP-Inner_CHAP", IDS_ONC_WIFI_EAP_INNER_CHAP},
2019 {"OncWiFi-EAP-Inner_GTC", IDS_ONC_WIFI_EAP_INNER_GTC}, 2024 {"OncWiFi-EAP-Inner_GTC", IDS_ONC_WIFI_EAP_INNER_GTC},
2020 {"OncWiFi-EAP-Outer", IDS_ONC_WIFI_EAP_OUTER}, 2025 {"OncWiFi-EAP-Outer", IDS_ONC_WIFI_EAP_OUTER},
2026 {"OncWiFi-EAP-Password", IDS_ONC_WIFI_PASSWORD},
2021 {"OncWiFi-EAP-SubjectMatch", IDS_ONC_WIFI_EAP_SUBJECT_MATCH}, 2027 {"OncWiFi-EAP-SubjectMatch", IDS_ONC_WIFI_EAP_SUBJECT_MATCH},
2028 {"OncWiFi-Passphrase", IDS_ONC_WIFI_PASSWORD},
2029 {"OncWiFi-SSID", IDS_ONC_WIFI_SSID},
2022 {"OncWiFi-Security", IDS_ONC_WIFI_SECURITY}, 2030 {"OncWiFi-Security", IDS_ONC_WIFI_SECURITY},
2031 {"OncWiFi-Security_None", IDS_ONC_WIFI_SECURITY_NONE},
2032 {"OncWiFi-Security_WEP", IDS_ONC_WIFI_SECURITY_WEP},
2033 {"OncWiFi-Security_PSK", IDS_ONC_WIFI_SECURITY_PSK},
2034 {"OncWiFi-Security_EAP", IDS_ONC_WIFI_SECURITY_EAP},
2023 {"OncWiFi-SignalStrength", IDS_ONC_WIFI_SIGNAL_STRENGTH}, 2035 {"OncWiFi-SignalStrength", IDS_ONC_WIFI_SIGNAL_STRENGTH},
2024 {"OncWiMAX-EAP-Identity", IDS_ONC_WIMAX_EAP_IDENTITY}, 2036 {"OncWiMAX-EAP-Identity", IDS_ONC_WIMAX_EAP_IDENTITY},
2025 {"Oncipv4-Gateway", IDS_ONC_IPV4_GATEWAY}, 2037 {"Oncipv4-Gateway", IDS_ONC_IPV4_GATEWAY},
2026 {"Oncipv4-IPAddress", IDS_ONC_IPV4_ADDRESS}, 2038 {"Oncipv4-IPAddress", IDS_ONC_IPV4_ADDRESS},
2027 {"Oncipv4-RoutingPrefix", IDS_ONC_IPV4_ROUTING_PREFIX}, 2039 {"Oncipv4-RoutingPrefix", IDS_ONC_IPV4_ROUTING_PREFIX},
2028 {"Oncipv6-IPAddress", IDS_ONC_IPV6_ADDRESS}, 2040 {"Oncipv6-IPAddress", IDS_ONC_IPV6_ADDRESS},
2029 }; 2041 };
2030 AddLocalizedStringsBulk(html_source, onc_property_strings, 2042 AddLocalizedStringsBulk(html_source, onc_property_strings,
2031 arraysize(onc_property_strings)); 2043 arraysize(onc_property_strings));
2032 } 2044 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
2078 2090
2079 #if defined(OS_CHROMEOS) 2091 #if defined(OS_CHROMEOS)
2080 chromeos::network_element::AddLocalizedStrings(html_source); 2092 chromeos::network_element::AddLocalizedStrings(html_source);
2081 #endif 2093 #endif
2082 policy_indicator::AddLocalizedStrings(html_source); 2094 policy_indicator::AddLocalizedStrings(html_source);
2083 2095
2084 html_source->SetJsonPath(kLocalizedStringsFile); 2096 html_source->SetJsonPath(kLocalizedStringsFile);
2085 } 2097 }
2086 2098
2087 } // namespace settings 2099 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698