chrome/browser/resources/settings/settings_resources.grd - Issue 1219753007: Add network proxy input to md-settings internet details

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/resources/settings/settings_resources.grd

Issue 1219753007: Add network proxy input to md-settings internet details (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_470445_onc_proxy

Patch Set: Rebase Created 5 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/settings/internet_page/network_proxy_input.js ('k') | chromeos/dbus/fake_shill_manager_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/settings_resources.grd

diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd

index 7110ecf209640f9f7e085001994da8409c15a73c..c19a885dff270b31d65751d38269c267f24d0c46 100644

--- a/chrome/browser/resources/settings/settings_resources.grd

+++ b/chrome/browser/resources/settings/settings_resources.grd

@@ -273,6 +273,33 @@

<structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_JS"

file="internet_page/network_property_list.js"

type="chrome_html" />

+ <structure name="IDR_SETTINGS_NETWORK_PROXY_CSS"

+ file="internet_page/network_proxy.css"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_NETWORK_PROXY_HTML"

+ file="internet_page/network_proxy.html"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_NETWORK_PROXY_JS"

+ file="internet_page/network_proxy.js"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_NETWORK_PROXY_EXCLUSIONS_CSS"

+ file="internet_page/network_proxy_exclusions.css"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_NETWORK_PROXY_EXCLUSIONS_HTML"

+ file="internet_page/network_proxy_exclusions.html"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_NETWORK_PROXY_EXCLUSIONS_JS"

+ file="internet_page/network_proxy_exclusions.js"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_NETWORK_PROXY_INPUT_CSS"

+ file="internet_page/network_proxy_input.css"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_NETWORK_PROXY_INPUT_HTML"

+ file="internet_page/network_proxy_input.html"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_NETWORK_PROXY_INPUT_JS"

+ file="internet_page/network_proxy_input.js"

+ type="chrome_html" />

<structure name="IDR_SETTINGS_NETWORK_SUMMARY_CSS"

file="internet_page/network_summary.css"

type="chrome_html" />