chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc - Issue 2467123003: Settings: Internet: Update proxy controlled indicator and fields.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2467123003: Settings: Internet: Update proxy controlled indicator and fields. (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

« no previous file with comments | « chrome/browser/resources/settings/internet_page/network_proxy_input.html ('k') | ui/webui/resources/cr_elements/network/cr_onc_types.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 178df92bff59aa173d6234a4bf7fa4c39eb5ec27..af6faf9b5ae7dc62c9d20f28b08b0a41eaaeb4be 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

@@ -799,7 +799,10 @@ void AddInternetStrings(content::WebUIDataSource* html_source) {

IDS_SETTINGS_INTERNET_NETWORK_PROXY_AUTO_CONFIG},

{"networkProxyConnectionType",

IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE},

- {"networkProxyEnforced", IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED},

+ {"networkProxyControlledExtension",

+ IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONTROLLED_EXTENSION},

+ {"networkProxyEnforcedPolicy",

+ IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED_POLICY},

{"networkProxyExceptionList",

IDS_SETTINGS_INTERNET_NETWORK_PROXY_EXCEPTION_LIST},

{"networkProxyFtp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_FTP_PROXY},

@@ -807,6 +810,12 @@ void AddInternetStrings(content::WebUIDataSource* html_source) {

{"networkProxyPort", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PORT},

{"networkProxyShttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SHTTP_PROXY},

{"networkProxySocks", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SOCKS_HOST},

+ {"networkProxyTypeDirect",

+ IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_DIRECT},

+ {"networkProxyTypeManual",

+ IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_MANUAL},

+ {"networkProxyTypePac", IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_PAC},

+ {"networkProxyTypeWpad", IDS_SETTINGS_INTERNET_NETWORK_PROXY_TYPE_WPAD},

{"networkProxyUseSame", IDS_SETTINGS_INTERNET_NETWORK_PROXY_USE_SAME},

{"networkSectionAccessPoint",

IDS_SETTINGS_INTERNET_NETWORK_SECTION_ACCESS_POINT},