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

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

Issue 8589001: Load mac sandbox definitions from resources instead of the bundle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/nacl_loader.sb » ('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 <output filename="browser_resources.rc" type="rc_all" /> 8 <output filename="browser_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" /> 160 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" />
161 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 161 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
162 <include name="IDR_REPOST_FORM_WARNING_HTML" file="resources\repost_form _warning.html" flattenhtml="true" type="BINDATA" /> 162 <include name="IDR_REPOST_FORM_WARNING_HTML" file="resources\repost_form _warning.html" flattenhtml="true" type="BINDATA" />
163 </if> 163 </if>
164 <if expr="pp_ifdef('use_aura')"> 164 <if expr="pp_ifdef('use_aura')">
165 <include name="IDR_APP_LIST_HTML" file="resources\aura\app_list\app_list .html" flattenhtml="true" type="BINDATA" /> 165 <include name="IDR_APP_LIST_HTML" file="resources\aura\app_list\app_list .html" flattenhtml="true" type="BINDATA" />
166 </if> 166 </if>
167 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 167 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
168 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 168 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
169 </if> 169 </if>
170 <if expr="pp_ifdef('is_macosx')">
171 <include name="IDR_NACL_SANDBOX_DEFINITION" file="nacl_loader.sb" type=" BINDATA" />
172 </if>
173 </includes> 170 </includes>
174 </release> 171 </release>
175 </grit> 172 </grit>
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/nacl_loader.sb » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698