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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 type="chrome_html" /> 266 type="chrome_html" />
267 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_CSS" 267 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_CSS"
268 file="internet_page/network_property_list.css" 268 file="internet_page/network_property_list.css"
269 type="chrome_html" /> 269 type="chrome_html" />
270 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_HTML" 270 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_HTML"
271 file="internet_page/network_property_list.html" 271 file="internet_page/network_property_list.html"
272 type="chrome_html" /> 272 type="chrome_html" />
273 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_JS" 273 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_JS"
274 file="internet_page/network_property_list.js" 274 file="internet_page/network_property_list.js"
275 type="chrome_html" /> 275 type="chrome_html" />
276 <structure name="IDR_SETTINGS_NETWORK_PROXY_CSS"
277 file="internet_page/network_proxy.css"
278 type="chrome_html" />
279 <structure name="IDR_SETTINGS_NETWORK_PROXY_HTML"
280 file="internet_page/network_proxy.html"
281 type="chrome_html" />
282 <structure name="IDR_SETTINGS_NETWORK_PROXY_JS"
283 file="internet_page/network_proxy.js"
284 type="chrome_html" />
285 <structure name="IDR_SETTINGS_NETWORK_PROXY_EXCLUSIONS_CSS"
286 file="internet_page/network_proxy_exclusions.css"
287 type="chrome_html" />
288 <structure name="IDR_SETTINGS_NETWORK_PROXY_EXCLUSIONS_HTML"
289 file="internet_page/network_proxy_exclusions.html"
290 type="chrome_html" />
291 <structure name="IDR_SETTINGS_NETWORK_PROXY_EXCLUSIONS_JS"
292 file="internet_page/network_proxy_exclusions.js"
293 type="chrome_html" />
294 <structure name="IDR_SETTINGS_NETWORK_PROXY_INPUT_CSS"
295 file="internet_page/network_proxy_input.css"
296 type="chrome_html" />
297 <structure name="IDR_SETTINGS_NETWORK_PROXY_INPUT_HTML"
298 file="internet_page/network_proxy_input.html"
299 type="chrome_html" />
300 <structure name="IDR_SETTINGS_NETWORK_PROXY_INPUT_JS"
301 file="internet_page/network_proxy_input.js"
302 type="chrome_html" />
276 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_CSS" 303 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_CSS"
277 file="internet_page/network_summary.css" 304 file="internet_page/network_summary.css"
278 type="chrome_html" /> 305 type="chrome_html" />
279 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_HTML" 306 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_HTML"
280 file="internet_page/network_summary.html" 307 file="internet_page/network_summary.html"
281 type="chrome_html" /> 308 type="chrome_html" />
282 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_JS" 309 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_JS"
283 file="internet_page/network_summary.js" 310 file="internet_page/network_summary.js"
284 type="chrome_html" /> 311 type="chrome_html" />
285 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_CSS" 312 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_CSS"
(...skipping 24 matching lines...) Expand all
310 type="chrome_html" 337 type="chrome_html"
311 flattenhtml="true" 338 flattenhtml="true"
312 allowexternalscript="true" /> 339 allowexternalscript="true" />
313 <structure name="IDR_SETTINGS_USERS_PAGE_CSS" 340 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"
314 file="users_page/users_page.css" 341 file="users_page/users_page.css"
315 type="chrome_html" /> 342 type="chrome_html" />
316 </if> 343 </if>
317 </structures> 344 </structures>
318 </release> 345 </release>
319 </grit> 346 </grit>
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698