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

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2499483002: MD Settings: Internet: Allow Shared Proxies (Closed)
Patch Set: Rebase Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
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 7fef08447eb459bcf0c995a1233478d74e5a7367..39d833b5c7a1aae1a2a2e5757df5d8a7ccc8e634 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
@@ -790,12 +790,17 @@ void AddInternetStrings(content::WebUIDataSource* html_source) {
{"networkButtonSaveApn", IDS_SETTINGS_INTERNET_BUTTON_SAVE_APN},
{"networkButtonViewAccount", IDS_SETTINGS_INTERNET_BUTTON_VIEW_ACCOUNT},
{"networkIPAddress", IDS_SETTINGS_INTERNET_NETWORK_IP_ADDRESS},
- {"networkIPConfigAuto",
- IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO},
+ {"networkIPConfigAuto", IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO},
{"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER},
{"networkProxy", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PROXY},
{"networkProxyAddException",
IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION},
+ {"networkProxyAllowShared",
+ IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED},
+ {"networkProxyAllowSharedWarningTitle",
+ IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_TITLE},
+ {"networkProxyAllowSharedWarningMessage",
+ IDS_SETTINGS_INTERNET_NETWORK_PROXY_ALLOW_SHARED_WARNING_MESSAGE},
{"networkProxyAutoConfig",
IDS_SETTINGS_INTERNET_NETWORK_PROXY_AUTO_CONFIG},
{"networkProxyConnectionType",
@@ -832,8 +837,7 @@ void AddInternetStrings(content::WebUIDataSource* html_source) {
{"networkShared", IDS_SETTINGS_INTERNET_NETWORK_SHARED},
{"networkSimCardLocked", IDS_SETTINGS_INTERNET_NETWORK_SIM_CARD_LOCKED},
{"networkSimCardMissing", IDS_SETTINGS_INTERNET_NETWORK_SIM_CARD_MISSING},
- {"networkSimChange",
- IDS_SETTINGS_INTERNET_NETWORK_SIM_BUTTON_CHANGE},
+ {"networkSimChange", IDS_SETTINGS_INTERNET_NETWORK_SIM_BUTTON_CHANGE},
{"networkSimChangePin", IDS_SETTINGS_INTERNET_NETWORK_SIM_CHANGE_PIN},
{"networkSimChangePinTitle",
IDS_SETTINGS_INTERNET_NETWORK_SIM_CHANGE_PIN_TITLE},
@@ -854,8 +858,7 @@ void AddInternetStrings(content::WebUIDataSource* html_source) {
IDS_SETTINGS_INTERNET_NETWORK_SIM_RE_ENTER_NEW_PIN},
{"networkSimReEnterNewPin",
IDS_SETTINGS_INTERNET_NETWORK_SIM_RE_ENTER_NEW_PIN},
- {"networkSimUnlock",
- IDS_SETTINGS_INTERNET_NETWORK_SIM_BUTTON_UNLOCK},
+ {"networkSimUnlock", IDS_SETTINGS_INTERNET_NETWORK_SIM_BUTTON_UNLOCK},
};
AddLocalizedStringsBulk(html_source, localized_strings,
arraysize(localized_strings));

Powered by Google App Engine
This is Rietveld 408576698