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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1494253003: MD Downloads: add a use_vulcanize option to Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: self-review Created 5 years 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
« build/common.gypi ('K') | « build/common.gypi ('k') | chrome/browser/ui/webui/md_downloads/md_downloads_ui.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>
11 <if expr="not is_win and not is_macosx and not is_ios"> 11 <if expr="not is_win and not is_macosx and not is_ios">
12 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" /> 12 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" />
13 </if> 13 </if>
14 <if expr="is_macosx or is_ios"> 14 <if expr="is_macosx or is_ios">
15 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" /> 15 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" />
16 </if> 16 </if>
17 <if expr="is_win"> 17 <if expr="is_win">
18 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" /> 18 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" />
19 </if> 19 </if>
20 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" f lattenhtml="true" type="chrome_html" /> 20 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" f lattenhtml="true" type="chrome_html" />
21 <if expr="enable_app_list"> 21 <if expr="enable_app_list">
22 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" /> 22 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" />
23 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\ start_page.html" flattenhtml="true" type="chrome_html" /> 23 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\ start_page.html" flattenhtml="true" type="chrome_html" />
24 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st art_page.js" flattenhtml="true" type="chrome_html" /> 24 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st art_page.js" flattenhtml="true" type="chrome_html" />
25 </if> 25 </if>
26 <if expr="not is_android"> 26 <if expr="not is_android">
27 <structure name="IDR_DOWNLOADS_DOWNLOADS_HTML" file="resources\downloads \downloads.html" flattenhtml="true" allowexternalscript="true" type="chrome_html " /> 27 <structure name="IDR_DOWNLOADS_DOWNLOADS_HTML" file="resources\downloads \downloads.html" flattenhtml="true" allowexternalscript="true" type="chrome_html " />
28 <structure name="IDR_MD_DOWNLOADS_DOWNLOADS_HTML" file="resources\md_dow nloads\downloads.html" flattenhtml="true" allowexternalscript="true" type="chrom e_html" /> 28 <if expr="use_vulcanize">
29 <structure name="IDR_MD_DOWNLOADS_VULCANIZED_HTML" file="resources\md_do wnloads\vulcanized.html" flattenhtml="true" allowexternalscript="true" type="chr ome_html" /> 29 <structure name="IDR_MD_DOWNLOADS_VULCANIZED_HTML" file="resources\md_ downloads\vulcanized.html" flattenhtml="true" allowexternalscript="true" type="c hrome_html" />
30 </if>
31 <if expr="not use_vulcanize">
groby-ooo-7-16 2015/12/04 22:23:33 The grd_reader unittest claims we have <else>...
Dan Beam 2015/12/05 02:21:41 yeah, but it adds more tags and more indent. can
32 <structure name="IDR_MD_DOWNLOADS_DOWNLOADS_HTML" file="resources\md_d ownloads\downloads.html" flattenhtml="true" allowexternalscript="true" type="chr ome_html" />
33 </if>
30 </if> 34 </if>
31 <if expr="enable_extensions"> 35 <if expr="enable_extensions">
32 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensi ons.html" flattenhtml="true" type="chrome_html" /> 36 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensi ons.html" flattenhtml="true" type="chrome_html" />
33 <structure name="IDR_MD_EXTENSIONS_EXTENSIONS_HTML" file="resources\md_e xtensions\extensions.html" flattenhtml="true" allowexternalscript="true" type="c hrome_html" /> 37 <structure name="IDR_MD_EXTENSIONS_EXTENSIONS_HTML" file="resources\md_e xtensions\extensions.html" flattenhtml="true" allowexternalscript="true" type="c hrome_html" />
34 </if> 38 </if>
35 <if expr="chromeos"> 39 <if expr="chromeos">
36 <structure name="IDR_FIRST_RUN_HTML" file="resources\chromeos\first_run\ first_run.html" flattenhtml="true" type="chrome_html"/> 40 <structure name="IDR_FIRST_RUN_HTML" file="resources\chromeos\first_run\ first_run.html" flattenhtml="true" type="chrome_html"/>
37 <structure name="IDR_FIRST_RUN_JS" file="resources\chromeos\first_run\fi rst_run.js" flattenhtml="true" type="chrome_html" /> 41 <structure name="IDR_FIRST_RUN_JS" file="resources\chromeos\first_run\fi rst_run.js" flattenhtml="true" type="chrome_html" />
38 </if> 42 </if>
39 <if expr="not is_android"> 43 <if expr="not is_android">
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 <include name="IDR_DOWNLOADS_CONSTANTS_JS" file="resources\downloads\con stants.js" type="BINDATA" /> 121 <include name="IDR_DOWNLOADS_CONSTANTS_JS" file="resources\downloads\con stants.js" type="BINDATA" />
118 <include name="IDR_DOWNLOADS_FOCUS_ROW_JS" file="resources\downloads\foc us_row.js" type="BINDATA" /> 122 <include name="IDR_DOWNLOADS_FOCUS_ROW_JS" file="resources\downloads\foc us_row.js" type="BINDATA" />
119 <include name="IDR_DOWNLOADS_ITEM_VIEW_JS" file="resources\downloads\ite m_view.js" type="BINDATA" /> 123 <include name="IDR_DOWNLOADS_ITEM_VIEW_JS" file="resources\downloads\ite m_view.js" type="BINDATA" />
120 <include name="IDR_DOWNLOADS_MANAGER_JS" file="resources\downloads\manag er.js" type="BINDATA" /> 124 <include name="IDR_DOWNLOADS_MANAGER_JS" file="resources\downloads\manag er.js" type="BINDATA" />
121 <include name="IDR_DOWNLOADS_THROTTLED_ICON_LOADER_HTML" file="resources \downloads\throttled_icon_loader.html" type="BINDATA" /> 125 <include name="IDR_DOWNLOADS_THROTTLED_ICON_LOADER_HTML" file="resources \downloads\throttled_icon_loader.html" type="BINDATA" />
122 <include name="IDR_DOWNLOADS_THROTTLED_ICON_LOADER_JS" file="resources\d ownloads\throttled_icon_loader.js" type="BINDATA" /> 126 <include name="IDR_DOWNLOADS_THROTTLED_ICON_LOADER_JS" file="resources\d ownloads\throttled_icon_loader.js" type="BINDATA" />
123 <include name="IDR_MD_DOWNLOADS_1X_INCOGNITO_MARKER_PNG" file="resources \md_downloads\1x\incognito_marker.png" type="BINDATA" /> 127 <include name="IDR_MD_DOWNLOADS_1X_INCOGNITO_MARKER_PNG" file="resources \md_downloads\1x\incognito_marker.png" type="BINDATA" />
124 <include name="IDR_MD_DOWNLOADS_2X_INCOGNITO_MARKER_PNG" file="resources \md_downloads\2x\incognito_marker.png" type="BINDATA" /> 128 <include name="IDR_MD_DOWNLOADS_2X_INCOGNITO_MARKER_PNG" file="resources \md_downloads\2x\incognito_marker.png" type="BINDATA" />
125 <include name="IDR_MD_DOWNLOADS_1X_NO_DOWNLOADS_PNG" file="resources\md_ downloads\1x\no_downloads.png" type="BINDATA" /> 129 <include name="IDR_MD_DOWNLOADS_1X_NO_DOWNLOADS_PNG" file="resources\md_ downloads\1x\no_downloads.png" type="BINDATA" />
126 <include name="IDR_MD_DOWNLOADS_2X_NO_DOWNLOADS_PNG" file="resources\md_ downloads\2x\no_downloads.png" type="BINDATA" /> 130 <include name="IDR_MD_DOWNLOADS_2X_NO_DOWNLOADS_PNG" file="resources\md_ downloads\2x\no_downloads.png" type="BINDATA" />
127 <include name="IDR_MD_DOWNLOADS_ACTION_SERVICE_HTML" file="resources\md_ downloads\action_service.html" type="BINDATA" /> 131 <if expr="use_vulcanize">
128 <include name="IDR_MD_DOWNLOADS_ACTION_SERVICE_JS" file="resources\md_do wnloads\action_service.js" type="BINDATA" /> 132 <include name="IDR_MD_DOWNLOADS_CRISPER_JS" file="resources\md_downloa ds\crisper.js" flattenhtml="true" type="BINDATA" />
129 <include name="IDR_MD_DOWNLOADS_CONSTANTS_HTML" file="resources\md_downl oads\constants.html" type="BINDATA" /> 133 </if>
130 <include name="IDR_MD_DOWNLOADS_CONSTANTS_JS" file="resources\md_downloa ds\constants.js" type="BINDATA" /> 134 <if expr="not use_vulcanize">
131 <include name="IDR_MD_DOWNLOADS_CRISPER_JS" file="resources\md_downloads \crisper.js" flattenhtml="true" type="BINDATA" /> 135 <include name="IDR_MD_DOWNLOADS_ACTION_SERVICE_HTML" file="resources\m d_downloads\action_service.html" type="BINDATA" />
132 <include name="IDR_MD_DOWNLOADS_DOWNLOADS_JS" file="resources\md_downloa ds\downloads.js" type="BINDATA" /> 136 <include name="IDR_MD_DOWNLOADS_ACTION_SERVICE_JS" file="resources\md_ downloads\action_service.js" type="BINDATA" />
133 <include name="IDR_MD_DOWNLOADS_I18N_SETUP_HTML" file="resources\md_down loads\i18n_setup.html" type="BINDATA" /> 137 <include name="IDR_MD_DOWNLOADS_CONSTANTS_HTML" file="resources\md_dow nloads\constants.html" type="BINDATA" />
134 <include name="IDR_MD_DOWNLOADS_ITEM_CSS" file="resources\md_downloads\i tem.css" type="BINDATA" flattenhtml="true" /> 138 <include name="IDR_MD_DOWNLOADS_CONSTANTS_JS" file="resources\md_downl oads\constants.js" type="BINDATA" />
135 <include name="IDR_MD_DOWNLOADS_ITEM_HTML" file="resources\md_downloads\ item.html" type="BINDATA" /> 139 <include name="IDR_MD_DOWNLOADS_DOWNLOADS_JS" file="resources\md_downl oads\downloads.js" type="BINDATA" />
136 <include name="IDR_MD_DOWNLOADS_ITEM_JS" file="resources\md_downloads\it em.js" type="BINDATA" /> 140 <include name="IDR_MD_DOWNLOADS_I18N_SETUP_HTML" file="resources\md_do wnloads\i18n_setup.html" type="BINDATA" />
137 <include name="IDR_MD_DOWNLOADS_MANAGER_CSS" file="resources\md_download s\manager.css" type="BINDATA" flattenhtml="true" /> 141 <include name="IDR_MD_DOWNLOADS_ITEM_CSS" file="resources\md_downloads \item.css" type="BINDATA" flattenhtml="true" />
138 <include name="IDR_MD_DOWNLOADS_MANAGER_HTML" file="resources\md_downloa ds\manager.html" type="BINDATA" /> 142 <include name="IDR_MD_DOWNLOADS_ITEM_HTML" file="resources\md_download s\item.html" type="BINDATA" />
139 <include name="IDR_MD_DOWNLOADS_MANAGER_JS" file="resources\md_downloads \manager.js" type="BINDATA" /> 143 <include name="IDR_MD_DOWNLOADS_ITEM_JS" file="resources\md_downloads\ item.js" type="BINDATA" />
140 <include name="IDR_MD_DOWNLOADS_SHARED_STYLE_CSS" file="resources\md_dow nloads\shared_style.css" type="BINDATA" /> 144 <include name="IDR_MD_DOWNLOADS_MANAGER_CSS" file="resources\md_downlo ads\manager.css" type="BINDATA" flattenhtml="true" />
141 <include name="IDR_MD_DOWNLOADS_TOOLBAR_CSS" file="resources\md_download s\toolbar.css" type="BINDATA" /> 145 <include name="IDR_MD_DOWNLOADS_MANAGER_HTML" file="resources\md_downl oads\manager.html" type="BINDATA" />
142 <include name="IDR_MD_DOWNLOADS_TOOLBAR_HTML" file="resources\md_downloa ds\toolbar.html" type="BINDATA" /> 146 <include name="IDR_MD_DOWNLOADS_MANAGER_JS" file="resources\md_downloa ds\manager.js" type="BINDATA" />
143 <include name="IDR_MD_DOWNLOADS_TOOLBAR_JS" file="resources\md_downloads \toolbar.js" type="BINDATA" /> 147 <include name="IDR_MD_DOWNLOADS_SHARED_STYLE_CSS" file="resources\md_d ownloads\shared_style.css" type="BINDATA" />
148 <include name="IDR_MD_DOWNLOADS_TOOLBAR_CSS" file="resources\md_downlo ads\toolbar.css" type="BINDATA" />
149 <include name="IDR_MD_DOWNLOADS_TOOLBAR_HTML" file="resources\md_downl oads\toolbar.html" type="BINDATA" />
150 <include name="IDR_MD_DOWNLOADS_TOOLBAR_JS" file="resources\md_downloa ds\toolbar.js" type="BINDATA" />
151 </if>
144 </if> 152 </if>
145 <if expr="enable_extensions"> 153 <if expr="enable_extensions">
146 <include name="IDR_EXTENSION_COMMAND_LIST_JS" file="resources\extensions \extension_command_list.js" flattenhtml="true" type="BINDATA" /> 154 <include name="IDR_EXTENSION_COMMAND_LIST_JS" file="resources\extensions \extension_command_list.js" flattenhtml="true" type="BINDATA" />
147 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" /> 155 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" />
148 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" /> 156 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" />
149 <include name="IDR_MD_EXTENSIONS_MANAGER_CSS" file="resources\md_extensi ons\manager.css" type="BINDATA" /> 157 <include name="IDR_MD_EXTENSIONS_MANAGER_CSS" file="resources\md_extensi ons\manager.css" type="BINDATA" />
150 <include name="IDR_MD_EXTENSIONS_MANAGER_HTML" file="resources\md_extens ions\manager.html" type="BINDATA" /> 158 <include name="IDR_MD_EXTENSIONS_MANAGER_HTML" file="resources\md_extens ions\manager.html" type="BINDATA" />
151 <include name="IDR_MD_EXTENSIONS_MANAGER_JS" file="resources\md_extensio ns\manager.js" type="BINDATA" /> 159 <include name="IDR_MD_EXTENSIONS_MANAGER_JS" file="resources\md_extensio ns\manager.js" type="BINDATA" />
152 <include name="IDR_MD_EXTENSIONS_ICONS_HTML" file="resources\md_extensio ns\icons.html" type="BINDATA" /> 160 <include name="IDR_MD_EXTENSIONS_ICONS_HTML" file="resources\md_extensio ns\icons.html" type="BINDATA" />
153 <include name="IDR_MD_EXTENSIONS_ITEM_CSS" file="resources\md_extensions \item.css" type="BINDATA" /> 161 <include name="IDR_MD_EXTENSIONS_ITEM_CSS" file="resources\md_extensions \item.css" type="BINDATA" />
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 </if> 471 </if>
464 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 472 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
465 </if> 473 </if>
466 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 474 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
467 <if expr="enable_media_router"> 475 <if expr="enable_media_router">
468 <part file="media_router_resources.grdp" /> 476 <part file="media_router_resources.grdp" />
469 </if> 477 </if>
470 </includes> 478 </includes>
471 </release> 479 </release>
472 </grit> 480 </grit>
OLDNEW
« build/common.gypi ('K') | « build/common.gypi ('k') | chrome/browser/ui/webui/md_downloads/md_downloads_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698