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

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

Issue 10540033: Add ENABLE_PRINTING and disable it on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Arrange some ifdefs Created 8 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 | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/chrome_content_browser_client.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 17 matching lines...) Expand all
28 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 28 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
29 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" /> 29 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" />
30 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 30 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
31 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" /> 31 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" />
32 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 32 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
33 <if expr="is_posix and not is_macosx"> 33 <if expr="is_posix and not is_macosx">
34 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" /> 34 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" />
35 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 35 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
36 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 36 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
37 </if> 37 </if>
38 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ma nifest.json" type="BINDATA" /> 38 <if expr="pp_ifdef('enable_printing')">
39 <include name="IDR_CLOUD_PRINT_SETUP_DONE_HTML" file="resources\cloud_prin t\cloud_print_setup_done.html" flattenhtml="true" type="BINDATA" /> 39 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" />
40 <include name="IDR_CLOUD_PRINT_SETUP_FLOW_HTML" file="resources\cloud_prin t\cloud_print_setup_flow.html" flattenhtml="true" type="BINDATA" /> 40 <include name="IDR_CLOUD_PRINT_SETUP_DONE_HTML" file="resources\cloud_pr int\cloud_print_setup_done.html" flattenhtml="true" type="BINDATA" />
41 <include name="IDR_CLOUD_PRINT_SETUP_LOGIN_HTML" file="resources\cloud_pri nt\cloud_print_setup_login.html" flattenhtml="true" type="BINDATA" /> 41 <include name="IDR_CLOUD_PRINT_SETUP_FLOW_HTML" file="resources\cloud_pr int\cloud_print_setup_flow.html" flattenhtml="true" type="BINDATA" />
42 <include name="IDR_CLOUD_PRINT_SETUP_LOGIN_HTML" file="resources\cloud_p rint\cloud_print_setup_login.html" flattenhtml="true" type="BINDATA" />
43 </if>
42 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 44 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
43 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" /> 45 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" />
44 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" /> 46 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />
45 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" /> 47 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" />
46 <include name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.css" flattenhtml="true" type="BINDATA" /> 48 <include name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.css" flattenhtml="true" type="BINDATA" />
47 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.htm l" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 49 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.htm l" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
48 <include name="IDR_DOWNLOADS_JS" file="resources\downloads\downloads.js" t ype="BINDATA" /> 50 <include name="IDR_DOWNLOADS_JS" file="resources\downloads\downloads.js" t ype="BINDATA" />
49 <include name="IDR_EXTENSION_COMMAND_LIST_JS" file="resources\extensions\e xtension_command_list.js" flattenhtml="true" type="BINDATA" /> 51 <include name="IDR_EXTENSION_COMMAND_LIST_JS" file="resources\extensions\e xtension_command_list.js" flattenhtml="true" type="BINDATA" />
50 <if expr="is_macosx"> 52 <if expr="is_macosx">
51 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" /> 53 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" />
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 </if> 96 </if>
95 <if expr="is_macosx"> 97 <if expr="is_macosx">
96 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_mac.json" type="BINDATA" /> 98 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_mac.json" type="BINDATA" />
97 </if> 99 </if>
98 <if expr="is_linux"> 100 <if expr="is_linux">
99 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_linux.json" type="BINDATA" /> 101 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_linux.json" type="BINDATA" />
100 </if> 102 </if>
101 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA"/ > 103 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA"/ >
102 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> 104 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/>
103 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> 105 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
104 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 106 <if expr="pp_ifdef('enable_printing')">
105 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" /> 107 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\pri nt_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
106 <include name="IDR_PRINT_PREVIEW_IMAGES_CLASSIC_PRINTER_32" 108 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print _preview.js" flattenhtml="true" type="BINDATA" />
107 file="resources\print_preview\images\classic_printer_32.png" type ="BINDATA" /> 109 <include name="IDR_PRINT_PREVIEW_IMAGES_CLASSIC_PRINTER_32"
108 <include name="IDR_PRINT_PREVIEW_IMAGES_CLOUD_PRINTER_32" 110 file="resources\print_preview\images\classic_printer_32.png" ty pe="BINDATA" />
109 file="resources\print_preview\images\cloud_printer_32.png" type=" BINDATA" /> 111 <include name="IDR_PRINT_PREVIEW_IMAGES_CLOUD_PRINTER_32"
110 <include name="IDR_PRINT_PREVIEW_IMAGES_CLOUD_PRINTER_SHARED_32" 112 file="resources\print_preview\images\cloud_printer_32.png" type ="BINDATA" />
111 file="resources\print_preview\images\cloud_printer_shared_32.png" type="BINDATA" /> 113 <include name="IDR_PRINT_PREVIEW_IMAGES_CLOUD_PRINTER_SHARED_32"
112 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_PROMOTED_PRINTER_32" 114 file="resources\print_preview\images\cloud_printer_shared_32.pn g" type="BINDATA" />
113 file="resources\print_preview\images\google_promoted_printer_32.p ng" type="BINDATA" /> 115 <include name="IDR_PRINT_PREVIEW_IMAGES_GOOGLE_PROMOTED_PRINTER_32"
114 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_32" 116 file="resources\print_preview\images\google_promoted_printer_32 .png" type="BINDATA" />
115 file="resources\print_preview\images\mobile_32.png" type="BINDATA " /> 117 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_32"
116 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED_32" 118 file="resources\print_preview\images\mobile_32.png" type="BINDA TA" />
117 file="resources\print_preview\images\mobile_shared_32.png" type=" BINDATA" /> 119 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED_32"
120 file="resources\print_preview\images\mobile_shared_32.png" type ="BINDATA" />
121 </if>
118 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 122 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
119 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" /> 123 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" />
120 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" /> 124 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" />
121 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" /> 125 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" />
122 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> 126 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
123 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" /> 127 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" />
124 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestions _internals\suggestions_internals.html" flattenhtml="true" allowexternalscript="t rue" type="BINDATA" /> 128 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestions _internals\suggestions_internals.html" flattenhtml="true" allowexternalscript="t rue" type="BINDATA" />
125 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestions_ internals\suggestions_internals.css" type="BINDATA" /> 129 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestions_ internals\suggestions_internals.css" type="BINDATA" />
126 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions_i nternals\suggestions_internals.js" type="BINDATA" /> 130 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions_i nternals\suggestions_internals.js" type="BINDATA" />
127 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestions_ page.css" type="BINDATA" /> 131 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestions_ page.css" type="BINDATA" />
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') "> 205 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') ">
202 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 206 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
203 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 207 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
204 </if> 208 </if>
205 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 209 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
206 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 210 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
207 </if> 211 </if>
208 </includes> 212 </includes>
209 </release> 213 </release>
210 </grit> 214 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698