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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2129413002: Use output_all_resource_defines=false in some chrome/ grd files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, address comment, more whitelist.cc cleanup Created 4 years, 5 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/theme/theme_resources.grd ('k') | chrome/browser/extensions/component_extensions_whitelist/whitelist.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" output_all_resource_defines= "false">
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="enable_app_list"> 11 <if expr="enable_app_list">
12 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" /> 12 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" />
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 <include name="IDR_SNIPPETS_INTERNALS_CSS" file="resources\snippets_inte rnals.css" compress="gzip" type="BINDATA" /> 189 <include name="IDR_SNIPPETS_INTERNALS_CSS" file="resources\snippets_inte rnals.css" compress="gzip" type="BINDATA" />
190 <include name="IDR_SNIPPETS_INTERNALS_JS" file="resources\snippets_inter nals.js" compress="gzip" type="BINDATA" /> 190 <include name="IDR_SNIPPETS_INTERNALS_JS" file="resources\snippets_inter nals.js" compress="gzip" type="BINDATA" />
191 </if> 191 </if>
192 <include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervi sed_user_internals.html" allowexternalscript="true" compress="gzip" type="BINDAT A" /> 192 <include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervi sed_user_internals.html" allowexternalscript="true" compress="gzip" type="BINDAT A" />
193 <include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervis ed_user_internals.css" compress="gzip" type="BINDATA" /> 193 <include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervis ed_user_internals.css" compress="gzip" type="BINDATA" />
194 <include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervise d_user_internals.js" compress="gzip" type="BINDATA" /> 194 <include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervise d_user_internals.js" compress="gzip" type="BINDATA" />
195 <if expr="_google_chrome or enable_hangout_services_extension"> 195 <if expr="_google_chrome or enable_hangout_services_extension">
196 <!-- Hangout Services extension, included in Google Chrome builds only. --> 196 <!-- Hangout Services extension, included in Google Chrome builds only. -->
197 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" /> 197 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" />
198 </if> 198 </if>
199 <include name="IDR_HOTWORD_MANIFEST" file="resources\hotword\manifest.json " type="BINDATA" /> 199 <if expr="enable_hotwording">
200 <include name="IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST" file="resources\ho tword_audio_verification\manifest.json" type="BINDATA" /> 200 <include name="IDR_HOTWORD_MANIFEST" file="resources\hotword\manifest.js on" type="BINDATA" />
201 <include name="IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST" file="resources\ hotword_audio_verification\manifest.json" type="BINDATA" />
202 </if>
201 <if expr="not is_android"> 203 <if expr="not is_android">
202 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" /> 204 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" />
203 <include name="IDR_HELP_PAGE_JS" file="resources\help\help_page.js" flat tenhtml="true" type="BINDATA" /> 205 <include name="IDR_HELP_PAGE_JS" file="resources\help\help_page.js" flat tenhtml="true" type="BINDATA" />
204 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ change_page.js" flattenhtml="true" type="BINDATA" /> 206 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ change_page.js" flattenhtml="true" type="BINDATA" />
205 </if> 207 </if>
206 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 208 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
207 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" /> 209 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" />
208 210
209 <if expr="not is_android and not is_ios"> 211 <if expr="not is_android and not is_ios">
210 <include name="IDR_MD_HISTORY_APP_HTML" file="resources\md_history\app.h tml" type="BINDATA" /> 212 <include name="IDR_MD_HISTORY_APP_HTML" file="resources\md_history\app.h tml" type="BINDATA" />
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 </if> 312 </if>
311 <if expr="chromeos"> 313 <if expr="chromeos">
312 <include name="IDR_ABOUT_VOICESEARCH_HTML" file="resources\about_voicese arch.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 314 <include name="IDR_ABOUT_VOICESEARCH_HTML" file="resources\about_voicese arch.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
313 <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesear ch.js" type="BINDATA" /> 315 <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesear ch.js" type="BINDATA" />
314 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_chromeos.json" type="BINDATA" /> 316 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_chromeos.json" type="BINDATA" />
315 </if> 317 </if>
316 <if expr="desktop_linux or (is_android and enable_plugins)"> 318 <if expr="desktop_linux or (is_android and enable_plugins)">
317 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_linux.json" type="BINDATA" /> 319 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_linux.json" type="BINDATA" />
318 </if> 320 </if>
319 <if expr="is_android"> 321 <if expr="is_android">
320 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" type= "BINDATA"/> 322 <then>
321 </if> 323 <include name="IDR_POLICY_CSS" file="resources\policy_android.css" typ e="BINDATA"/>
322 <if expr="not is_android"> 324 </then>
323 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA "/> 325 <else>
326 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDA TA"/>
327 </else>
324 </if> 328 </if>
325 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> 329 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/>
326 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> 330 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
327 <if expr="enable_print_preview"> 331 <if expr="enable_print_preview">
328 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 332 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
329 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" /> 333 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" />
330 <include name="IDR_PRINT_PREVIEW_PDF_PREVIEW_HTML" file="resources\print _preview\pdf_preview.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" /> 334 <include name="IDR_PRINT_PREVIEW_PDF_PREVIEW_HTML" file="resources\print _preview\pdf_preview.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" />
331 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER" 335 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER"
332 file="resources\print_preview\images\printer.png" type="BINDATA " /> 336 file="resources\print_preview\images\printer.png" type="BINDATA " />
333 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED" 337 <include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 </if> 511 </if>
508 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" /> 512 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" />
509 <include name="IDR_EASY_UNLOCK_MANIFEST_SIGNIN" file="resources\easy_unloc k\manifest_signin.json" type="BINDATA" /> 513 <include name="IDR_EASY_UNLOCK_MANIFEST_SIGNIN" file="resources\easy_unloc k\manifest_signin.json" type="BINDATA" />
510 <if expr="chromeos"> 514 <if expr="chromeos">
511 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" /> 515 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" />
512 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" /> 516 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" />
513 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" /> 517 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" />
514 </if> 518 </if>
515 <if expr="chromeos"> 519 <if expr="chromeos">
516 <if expr="_google_chrome"> 520 <if expr="_google_chrome">
517 <include name="IDR_GOOGLE_XKB_MANIFEST" file="resources\chromeos\input _method\google_xkb_manifest.json" type="BINDATA" /> 521 <then>
518 <include name="IDR_GOOGLE_INPUT_TOOLS_MANIFEST" file="resources\chrome os\input_method\google_input_tools_manifest.json" type="BINDATA" /> 522 <include name="IDR_GOOGLE_XKB_MANIFEST" file="resources\chromeos\inp ut_method\google_xkb_manifest.json" type="BINDATA" />
519 </if> 523 <include name="IDR_GOOGLE_INPUT_TOOLS_MANIFEST" file="resources\chro meos\input_method\google_input_tools_manifest.json" type="BINDATA" />
520 <if expr="not _google_chrome"> 524 </then>
521 <include name="IDR_XKB_MANIFEST" file="resources\chromeos\input_method \xkb_manifest.json" type="BINDATA" /> 525 <else>
522 <include name="IDR_M17N_MANIFEST" file="resources\chromeos\input_metho d\m17n_manifest.json" type="BINDATA" /> 526 <include name="IDR_XKB_MANIFEST" file="resources\chromeos\input_meth od\xkb_manifest.json" type="BINDATA" />
523 <include name="IDR_PINYIN_MANIFEST" file="resources\chromeos\input_met hod\pinyin_manifest.json" type="BINDATA" /> 527 <include name="IDR_M17N_MANIFEST" file="resources\chromeos\input_met hod\m17n_manifest.json" type="BINDATA" />
524 <include name="IDR_ZHUYIN_MANIFEST" file="resources\chromeos\input_met hod\zhuyin_manifest.json" type="BINDATA" /> 528 <include name="IDR_PINYIN_MANIFEST" file="resources\chromeos\input_m ethod\pinyin_manifest.json" type="BINDATA" />
525 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" /> 529 <include name="IDR_ZHUYIN_MANIFEST" file="resources\chromeos\input_m ethod\zhuyin_manifest.json" type="BINDATA" />
526 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> 530 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_ method\cangjie_manifest.json" type="BINDATA" />
527 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_met hod\hangul_manifest.json" type="BINDATA" /> 531 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_met hod\mozc_manifest.json" type="BINDATA" />
532 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_m ethod\hangul_manifest.json" type="BINDATA" />
533 </else>
528 </if> 534 </if>
529 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 535 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
530 </if> 536 </if>
531 <if expr="enable_media_router"> 537 <if expr="enable_media_router">
532 <part file="media_router_resources.grdp" /> 538 <part file="media_router_resources.grdp" />
533 </if> 539 </if>
534 <if expr="enable_media_router and (chromeos or is_win or is_macosx)"> 540 <if expr="enable_media_router and (chromeos or is_win or is_macosx)">
535 <include name="IDR_CAST_HTML" file="resources\cast\cast.html" type="BIND ATA" /> 541 <include name="IDR_CAST_HTML" file="resources\cast\cast.html" type="BIND ATA" />
536 <include name="IDR_CAST_CSS" file="resources\cast\cast.css" type="BINDAT A" /> 542 <include name="IDR_CAST_CSS" file="resources\cast\cast.css" type="BINDAT A" />
537 <include name="IDR_CAST_JS" file="resources\cast\cast.js" type="BINDATA" /> 543 <include name="IDR_CAST_JS" file="resources\cast\cast.js" type="BINDATA" />
538 <include name="IDR_CAST_FAVICON" file="resources\cast\cast_favicon.ico" type="BINDATA" /> 544 <include name="IDR_CAST_FAVICON" file="resources\cast\cast_favicon.ico" type="BINDATA" />
539 </if> 545 </if>
540 <if expr="not is_android and not is_ios and not chromeos"> 546 <if expr="not is_android and not is_ios">
541 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" /> 547 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" />
542 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" /> 548 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />
543 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 549 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
544 </if> 550 </if>
545 </includes> 551 </includes>
546 </release> 552 </release>
547 </grit> 553 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/extensions/component_extensions_whitelist/whitelist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698