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

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

Issue 1881273002: Revert of Add download_file_types.proto with ascii->binary conversion, as a resource. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « chrome/browser/BUILD.gn ('k') | chrome/browser/resources/safe_browsing/BUILD.gn » ('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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 </if> 99 </if>
100 <if expr="enable_printing"> 100 <if expr="enable_printing">
101 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" /> 101 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" />
102 </if> 102 </if>
103 <if expr="not is_ios"> 103 <if expr="not is_ios">
104 <include name="IDR_DEVTOOLS_DISCOVERY_PAGE_HTML" file="devtools\frontend \devtools_discovery_page.html" type="BINDATA"/> 104 <include name="IDR_DEVTOOLS_DISCOVERY_PAGE_HTML" file="devtools\frontend \devtools_discovery_page.html" type="BINDATA"/>
105 </if> 105 </if>
106 <include name="IDR_DOMAIN_RELIABILITY_INTERNALS_HTML" file="resources\doma in_reliability_internals.html" type="BINDATA" /> 106 <include name="IDR_DOMAIN_RELIABILITY_INTERNALS_HTML" file="resources\doma in_reliability_internals.html" type="BINDATA" />
107 <include name="IDR_DOMAIN_RELIABILITY_INTERNALS_CSS" file="resources\domai n_reliability_internals.css" type="BINDATA" /> 107 <include name="IDR_DOMAIN_RELIABILITY_INTERNALS_CSS" file="resources\domai n_reliability_internals.css" type="BINDATA" />
108 <include name="IDR_DOMAIN_RELIABILITY_INTERNALS_JS" file="resources\domain _reliability_internals.js" type="BINDATA" /> 108 <include name="IDR_DOMAIN_RELIABILITY_INTERNALS_JS" file="resources\domain _reliability_internals.js" type="BINDATA" />
109 <if expr="not is_android and not is_ios">
110 <include name="IDR_DOWNLOAD_FILE_TYPES_PB" file="${root_gen_dir}\chrome\ browser\resources\safe_browsing\download_file_types.pb" use_base_dir="false" typ e="BINDATA" />
111 </if>
112 <if expr="not is_android"> 109 <if expr="not is_android">
113 <include name="IDR_MD_DOWNLOADS_1X_INCOGNITO_MARKER_PNG" file="resources \md_downloads\1x\incognito_marker.png" type="BINDATA" /> 110 <include name="IDR_MD_DOWNLOADS_1X_INCOGNITO_MARKER_PNG" file="resources \md_downloads\1x\incognito_marker.png" type="BINDATA" />
114 <include name="IDR_MD_DOWNLOADS_2X_INCOGNITO_MARKER_PNG" file="resources \md_downloads\2x\incognito_marker.png" type="BINDATA" /> 111 <include name="IDR_MD_DOWNLOADS_2X_INCOGNITO_MARKER_PNG" file="resources \md_downloads\2x\incognito_marker.png" type="BINDATA" />
115 <include name="IDR_MD_DOWNLOADS_1X_NO_DOWNLOADS_PNG" file="resources\md_ downloads\1x\no_downloads.png" type="BINDATA" /> 112 <include name="IDR_MD_DOWNLOADS_1X_NO_DOWNLOADS_PNG" file="resources\md_ downloads\1x\no_downloads.png" type="BINDATA" />
116 <include name="IDR_MD_DOWNLOADS_2X_NO_DOWNLOADS_PNG" file="resources\md_ downloads\2x\no_downloads.png" type="BINDATA" /> 113 <include name="IDR_MD_DOWNLOADS_2X_NO_DOWNLOADS_PNG" file="resources\md_ downloads\2x\no_downloads.png" type="BINDATA" />
117 <if expr="use_vulcanize"> 114 <if expr="use_vulcanize">
118 <then> 115 <then>
119 <include name="IDR_MD_DOWNLOADS_CRISPER_JS" file="resources\md_downl oads\crisper.js" flattenhtml="true" type="BINDATA" /> 116 <include name="IDR_MD_DOWNLOADS_CRISPER_JS" file="resources\md_downl oads\crisper.js" flattenhtml="true" type="BINDATA" />
120 </then> 117 </then>
121 <else> 118 <else>
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 <part file="media_router_resources.grdp" /> 495 <part file="media_router_resources.grdp" />
499 </if> 496 </if>
500 <if expr="not is_android and not is_ios and not chromeos"> 497 <if expr="not is_android and not is_ios and not chromeos">
501 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" /> 498 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" />
502 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" /> 499 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />
503 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 500 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
504 </if> 501 </if>
505 </includes> 502 </includes>
506 </release> 503 </release>
507 </grit> 504 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/resources/safe_browsing/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698