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

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 1077433002: Remove PrerenderLocalPredictor, part 1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 8 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 | « no previous file | chrome/browser/extensions/activity_log/activity_log_browsertest.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/browser_resources.h" type="rc_header"> 4 <output filename="grit/browser_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="browser_resources.pak" type="data_package" /> 7 <output filename="browser_resources.pak" type="data_package" />
8 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_linux.json" type="BINDATA" /> 244 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_linux.json" type="BINDATA" />
245 </if> 245 </if>
246 <if expr="is_android"> 246 <if expr="is_android">
247 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/> 247 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/>
248 </if> 248 </if>
249 <if expr="not is_android"> 249 <if expr="not is_android">
250 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/> 250 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/>
251 </if> 251 </if>
252 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> 252 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/>
253 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> 253 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
254 <include name="IDR_PRERENDER_URL_WHITELIST" file="resources\prerender_url_ whitelist.dat" type="BINDATA"/>
255 <if expr="enable_print_preview"> 254 <if expr="enable_print_preview">
256 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 255 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
257 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" /> 256 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" />
258 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER" 257 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER"
259 file="resources\print_preview\images\printer.png" type="BINDATA " /> 258 file="resources\print_preview\images\printer.png" type="BINDATA " />
260 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED" 259 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED"
261 file="resources\print_preview\images\printer_shared.png" type=" BINDATA" /> 260 file="resources\print_preview\images\printer_shared.png" type=" BINDATA" />
262 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC" 261 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_DOC"
263 file="resources\print_preview\images\google_doc.png" type="BIND ATA" /> 262 file="resources\print_preview\images\google_doc.png" type="BIND ATA" />
264 <include name="IDR_PRINT_PREVIEW_IMAGES_PDF" 263 <include name="IDR_PRINT_PREVIEW_IMAGES_PDF"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 </if> 448 </if>
450 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 449 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
451 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" /> 450 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" />
452 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" /> 451 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" />
453 <if expr="enable_media_router"> 452 <if expr="enable_media_router">
454 <part file="media_router_resources.grdp" /> 453 <part file="media_router_resources.grdp" />
455 </if> 454 </if>
456 </includes> 455 </includes>
457 </release> 456 </release>
458 </grit> 457 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/activity_log/activity_log_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698