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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 329853002: Enable about:nacl and correct symbol visibility for the plugin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | no next file » | 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 <includes> 80 <includes>
81 <if expr="is_win"> 81 <if expr="is_win">
82 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 82 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
83 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 83 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
84 </if> 84 </if>
85 <if expr="not is_android"> 85 <if expr="not is_android">
86 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" /> 86 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" />
87 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" /> 87 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" />
88 </if> 88 </if>
89 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" flatt enhtml="true" type="BINDATA" /> 89 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" flatt enhtml="true" type="BINDATA" />
90 <if expr="not is_android"> 90 <if expr="not disable_nacl">
91 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 91 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
92 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatt enhtml="true" type="chrome_html" /> 92 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatt enhtml="true" type="chrome_html" />
93 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="B INDATA" /> 93 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="B INDATA" />
94 </if> 94 </if>
95 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 95 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
96 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" /> 96 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" />
97 <if expr="not is_android"> 97 <if expr="not is_android">
98 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys\about_sys.h tml" flattenhtml="true" type="BINDATA" /> 98 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys\about_sys.h tml" flattenhtml="true" type="BINDATA" />
99 </if> 99 </if>
100 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" /> 100 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" />
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 </if> 218 </if>
219 <if expr="is_win"> 219 <if expr="is_win">
220 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" /> 220 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" />
221 </if> 221 </if>
222 <if expr="is_macosx"> 222 <if expr="is_macosx">
223 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_mac.json" type="BINDATA" /> 223 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_mac.json" type="BINDATA" />
224 </if> 224 </if>
225 <if expr="chromeos"> 225 <if expr="chromeos">
226 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_chromeos.json" type="BINDATA" /> 226 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_chromeos.json" type="BINDATA" />
227 </if> 227 </if>
228 <if expr="desktop_linux"> 228 <if expr="desktop_linux or (is_android and enable_plugins)">
229 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_linux.json" type="BINDATA" /> 229 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_linux.json" type="BINDATA" />
230 </if> 230 </if>
231 <if expr="is_android"> 231 <if expr="is_android">
232 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/> 232 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/>
233 </if> 233 </if>
234 <if expr="not is_android"> 234 <if expr="not is_android">
235 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/> 235 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/>
236 </if> 236 </if>
237 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> 237 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/>
238 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> 238 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" /> 410 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" />
411 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" /> 411 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" />
412 <if expr="chromeos"> 412 <if expr="chromeos">
413 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" /> 413 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" />
414 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" /> 414 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" />
415 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" /> 415 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" />
416 </if> 416 </if>
417 </includes> 417 </includes>
418 </release> 418 </release>
419 </grit> 419 </grit>
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698