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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: unifdef controller from startup, lets us do nicer excludes Created 8 years, 1 month 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/theme/theme_resources.grd ('k') | chrome/browser/extensions/component_loader.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 <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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY" 179 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY"
180 file="resources\print_preview\images\third_party.png" type="BIN DATA" /> 180 file="resources\print_preview\images\third_party.png" type="BIN DATA" />
181 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE" 181 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE"
182 file="resources\print_preview\images\mobile.png" type="BINDATA" /> 182 file="resources\print_preview\images\mobile.png" type="BINDATA" />
183 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED" 183 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED"
184 file="resources\print_preview\images\mobile_shared.png" type="B INDATA" /> 184 file="resources\print_preview\images\mobile_shared.png" type="B INDATA" />
185 </if> 185 </if>
186 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 186 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
187 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" /> 187 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" />
188 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> 188 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
189 <if expr="is_win"> 189 <if expr="pp_ifdef('enable_settings_app')">
190 <include name="IDR_SETTINGS_APP_MANIFEST" file="resources\settings_app\m anifest.json" type="BINDATA" /> 190 <include name="IDR_SETTINGS_APP_MANIFEST" file="resources\settings_app\m anifest.json" type="BINDATA" />
191 </if> 191 </if>
192 <if expr="not pp_ifdef('android')"> 192 <if expr="not pp_ifdef('android')">
193 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestio ns_internals\suggestions_internals.html" flattenhtml="true" allowexternalscript= "true" type="BINDATA" /> 193 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestio ns_internals\suggestions_internals.html" flattenhtml="true" allowexternalscript= "true" type="BINDATA" />
194 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestion s_internals\suggestions_internals.css" type="BINDATA" /> 194 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestion s_internals\suggestions_internals.css" type="BINDATA" />
195 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions _internals\suggestions_internals.js" type="BINDATA" /> 195 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions _internals\suggestions_internals.js" type="BINDATA" />
196 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestion s_page.css" type="BINDATA" /> 196 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestion s_page.css" type="BINDATA" />
197 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions _page.js" type="BINDATA" /> 197 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions _page.js" type="BINDATA" />
198 <include name="IDR_TRACING_HTML" file="..\..\third_party\trace-viewer\sr c\about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDAT A" /> 198 <include name="IDR_TRACING_HTML" file="..\..\third_party\trace-viewer\sr c\about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDAT A" />
199 <include name="IDR_TRACING_JS" file="..\..\third_party\trace-viewer\src\ about_tracing.js" flattenhtml="true" type="BINDATA" /> 199 <include name="IDR_TRACING_JS" file="..\..\third_party\trace-viewer\src\ about_tracing.js" flattenhtml="true" type="BINDATA" />
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 288 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
289 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 289 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
290 </if> 290 </if>
291 <if expr="is_win"> 291 <if expr="is_win">
292 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 292 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
293 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 293 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
294 </if> 294 </if>
295 </includes> 295 </includes>
296 </release> 296 </release>
297 </grit> 297 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698