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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1318143002: Always use ENABLE_PLUGINS to indicate plugins support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tryjob failures: forgot to set/check ENABLE_PDF in a couple places. Created 5 years, 3 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/app/chrome_main_delegate.cc ('k') | chrome/browser/prefs/browser_prefs.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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" /> 216 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" />
217 <include name="IDR_MOST_VISITED_SINGLE_HTML" file="resources\local_ntp\mos t_visited_single.html" type="BINDATA" /> 217 <include name="IDR_MOST_VISITED_SINGLE_HTML" file="resources\local_ntp\mos t_visited_single.html" type="BINDATA" />
218 <include name="IDR_MOST_VISITED_SINGLE_CSS" file="resources\local_ntp\most _visited_single.css" type="BINDATA" /> 218 <include name="IDR_MOST_VISITED_SINGLE_CSS" file="resources\local_ntp\most _visited_single.css" type="BINDATA" />
219 <include name="IDR_MOST_VISITED_SINGLE_JS" file="resources\local_ntp\most_ visited_single.js" type="BINDATA" /> 219 <include name="IDR_MOST_VISITED_SINGLE_JS" file="resources\local_ntp\most_ visited_single.js" type="BINDATA" />
220 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" /> 220 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" />
221 <include name="IDR_MOST_VISITED_WINDOW_DISPOSITION_UTIL_JS" file="resource s\local_ntp\window_disposition_util.js" type="BINDATA" /> 221 <include name="IDR_MOST_VISITED_WINDOW_DISPOSITION_UTIL_JS" file="resource s\local_ntp\window_disposition_util.js" type="BINDATA" />
222 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 222 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
223 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" /> 223 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />
224 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" /> 224 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />
225 <include name="IDR_OMNIBOX_MOJO_JS" file="${omnibox_mojom_file}" use_base_ dir="false" type="BINDATA"/> 225 <include name="IDR_OMNIBOX_MOJO_JS" file="${omnibox_mojom_file}" use_base_ dir="false" type="BINDATA"/>
226 <if expr="not is_android"> 226 <if expr="enable_plugins">
227 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 227 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
228 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " /> 228 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " />
229 </if> 229 </if>
230 <include name="IDR_COMPONENTS_HTML" file="resources\components.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" /> 230 <include name="IDR_COMPONENTS_HTML" file="resources\components.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" />
231 <include name="IDR_COMPONENTS_JS" file="resources\components.js" type="BIN DATA" /> 231 <include name="IDR_COMPONENTS_JS" file="resources\components.js" type="BIN DATA" />
232 <if expr="enable_plugins"> 232 <if expr="enable_plugins">
233 <include name="IDR_PDF_MANIFEST" file="resources\pdf\manifest.json" type ="BINDATA" /> 233 <include name="IDR_PDF_MANIFEST" file="resources\pdf\manifest.json" type ="BINDATA" />
234 </if> 234 </if>
235 <if expr="is_win"> 235 <if expr="is_win">
236 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" /> 236 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" />
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 </if> 446 </if>
447 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 447 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
448 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" /> 448 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" />
449 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" /> 449 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" />
450 <if expr="enable_media_router"> 450 <if expr="enable_media_router">
451 <part file="media_router_resources.grdp" /> 451 <part file="media_router_resources.grdp" />
452 </if> 452 </if>
453 </includes> 453 </includes>
454 </release> 454 </release>
455 </grit> 455 </grit>
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698