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

Side by Side 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: 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 unified diff | Download patch

« chrome/browser/resources/settings/internet_page/network_proxy.js ('K') | « chrome/browser/resources/settings/internet_page/network_proxy_input.js ('k') | extensions/common/api/networking_private.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <grit latest_public_release="0" current_release="1">	2 <grit latest_public_release="0" current_release="1">

3 <outputs>	3 <outputs>

4 <output filename="grit/settings_resources.h" type="rc_header">	4 <output filename="grit/settings_resources.h" type="rc_header">

5 <emit emit_type='prepend'></emit>	5 <emit emit_type='prepend'></emit>

6 </output>	6 </output>

7 <output filename="grit/settings_resources_map.cc"	7 <output filename="grit/settings_resources_map.cc"

8 type="resource_file_map_source" />	8 type="resource_file_map_source" />

9 <output filename="grit/settings_resources_map.h"	9 <output filename="grit/settings_resources_map.h"

10 type="resource_map_header" />	10 type="resource_map_header" />

(...skipping 258 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
269 type="chrome_html" />	269 type="chrome_html" />

270 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_CSS"	270 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_CSS"

271 file="internet_page/network_property_list.css"	271 file="internet_page/network_property_list.css"

272 type="chrome_html" />	272 type="chrome_html" />

273 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_HTML"	273 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_HTML"

274 file="internet_page/network_property_list.html"	274 file="internet_page/network_property_list.html"

275 type="chrome_html" />	275 type="chrome_html" />

276 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_JS"	276 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_JS"

277 file="internet_page/network_property_list.js"	277 file="internet_page/network_property_list.js"

278 type="chrome_html" />	278 type="chrome_html" />

	279 <structure name="IDR_SETTINGS_NETWORK_PROXY_CSS"

	280 file="internet_page/network_proxy.css"

	281 type="chrome_html" />

	282 <structure name="IDR_SETTINGS_NETWORK_PROXY_HTML"

	283 file="internet_page/network_proxy.html"

	284 type="chrome_html" />

	285 <structure name="IDR_SETTINGS_NETWORK_PROXY_JS"

	286 file="internet_page/network_proxy.js"

	287 type="chrome_html" />

	288 <structure name="IDR_SETTINGS_NETWORK_PROXY_INPUT_CSS"

	289 file="internet_page/network_proxy_input.css"

	290 type="chrome_html" />

	291 <structure name="IDR_SETTINGS_NETWORK_PROXY_INPUT_HTML"

	292 file="internet_page/network_proxy_input.html"

	293 type="chrome_html" />

	294 <structure name="IDR_SETTINGS_NETWORK_PROXY_INPUT_JS"

	295 file="internet_page/network_proxy_input.js"

	296 type="chrome_html" />

279 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_CSS"	297 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_CSS"

280 file="internet_page/network_summary.css"	298 file="internet_page/network_summary.css"

281 type="chrome_html" />	299 type="chrome_html" />

282 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_HTML"	300 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_HTML"

283 file="internet_page/network_summary.html"	301 file="internet_page/network_summary.html"

284 type="chrome_html" />	302 type="chrome_html" />

285 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_JS"	303 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_JS"

286 file="internet_page/network_summary.js"	304 file="internet_page/network_summary.js"

287 type="chrome_html" />	305 type="chrome_html" />

288 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_CSS"	306 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_CSS"

(...skipping 24 matching lines...) Expand all Loading...
313 type="chrome_html"	331 type="chrome_html"

314 flattenhtml="true"	332 flattenhtml="true"

315 allowexternalscript="true" />	333 allowexternalscript="true" />

316 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	334 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

317 file="users_page/users_page.css"	335 file="users_page/users_page.css"

318 type="chrome_html" />	336 type="chrome_html" />

319 </if>	337 </if>

320 </structures>	338 </structures>

321 </release>	339 </release>

322 </grit>	340 </grit>

OLD	NEW