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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12090110: Show an icon to launch Chrome (chrome_app) on the Windows App Launcher. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix case where chrome is not default browser, fix ordering Created 7 years, 10 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 | « no previous file | 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 <if expr="pp_ifdef('android')"> 71 <if expr="pp_ifdef('android')">
72 <include name="IDR_ABOUT_WELCOME_JS" file="resources\about_welcome_andro id\about_welcome_android.js" type="BINDATA" /> 72 <include name="IDR_ABOUT_WELCOME_JS" file="resources\about_welcome_andro id\about_welcome_android.js" type="BINDATA" />
73 </if> 73 </if>
74 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 74 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
75 <include name="IDR_APPS_DEBUGGER_MANIFEST" file="resources\apps_debugger\m anifest.json" type="BINDATA" /> 75 <include name="IDR_APPS_DEBUGGER_MANIFEST" file="resources\apps_debugger\m anifest.json" type="BINDATA" />
76 <if expr="is_posix and not is_macosx"> 76 <if expr="is_posix and not is_macosx">
77 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" /> 77 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" />
78 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 78 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
79 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 79 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
80 </if> 80 </if>
81 <if expr="pp_ifdef('enable_app_list')">
82 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" />
83 </if>
81 <if expr="pp_ifdef('enable_printing')"> 84 <if expr="pp_ifdef('enable_printing')">
82 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" /> 85 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" />
83 <include name="IDR_CLOUD_PRINT_SETUP_DONE_HTML" file="resources\cloud_pr int\cloud_print_setup_done.html" flattenhtml="true" type="BINDATA" /> 86 <include name="IDR_CLOUD_PRINT_SETUP_DONE_HTML" file="resources\cloud_pr int\cloud_print_setup_done.html" flattenhtml="true" type="BINDATA" />
84 <include name="IDR_CLOUD_PRINT_SETUP_FLOW_HTML" file="resources\cloud_pr int\cloud_print_setup_flow.html" flattenhtml="true" type="BINDATA" /> 87 <include name="IDR_CLOUD_PRINT_SETUP_FLOW_HTML" file="resources\cloud_pr int\cloud_print_setup_flow.html" flattenhtml="true" type="BINDATA" />
85 <include name="IDR_CLOUD_PRINT_SETUP_LOGIN_HTML" file="resources\cloud_p rint\cloud_print_setup_login.html" flattenhtml="true" type="BINDATA" /> 88 <include name="IDR_CLOUD_PRINT_SETUP_LOGIN_HTML" file="resources\cloud_p rint\cloud_print_setup_login.html" flattenhtml="true" type="BINDATA" />
86 </if> 89 </if>
87 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 90 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
88 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" /> 91 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" />
89 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" /> 92 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />
90 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" /> 93 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" />
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 237 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
235 <include name="IDR_TASK_MANAGER_COMMANDS_JS" file="resources\task_manage r\commands.js" type="BINDATA" /> 238 <include name="IDR_TASK_MANAGER_COMMANDS_JS" file="resources\task_manage r\commands.js" type="BINDATA" />
236 <!-- The following defines.js uses flattenhtml feature to remove the pla tform-dependent code at compile-time. --> 239 <!-- The following defines.js uses flattenhtml feature to remove the pla tform-dependent code at compile-time. -->
237 <include name="IDR_TASK_MANAGER_DEFINES_JS" file="resources\task_manager \defines.js" flattenhtml="true" type="BINDATA" /> 240 <include name="IDR_TASK_MANAGER_DEFINES_JS" file="resources\task_manager \defines.js" flattenhtml="true" type="BINDATA" />
238 <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manage r\includes.js" type="BINDATA" /> 241 <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manage r\includes.js" type="BINDATA" />
239 <include name="IDR_TASK_MANAGER_PRELOAD_JS" file="resources\task_manager \preload.js" type="BINDATA" /> 242 <include name="IDR_TASK_MANAGER_PRELOAD_JS" file="resources\task_manager \preload.js" type="BINDATA" />
240 <!-- The following main.js uses flattenhtml feature to remove the platfo rm-dependent code at complie-time. --> 243 <!-- The following main.js uses flattenhtml feature to remove the platfo rm-dependent code at complie-time. -->
241 <include name="IDR_TASK_MANAGER_JS" file="resources\task_manager\main.js " flattenhtml="true" type="BINDATA" /> 244 <include name="IDR_TASK_MANAGER_JS" file="resources\task_manager\main.js " flattenhtml="true" type="BINDATA" />
242 <include name="IDR_TASK_MANAGER_MEASURE_TIME_JS" file="resources\task_ma nager\measure_time.js" type="BINDATA" /> 245 <include name="IDR_TASK_MANAGER_MEASURE_TIME_JS" file="resources\task_ma nager\measure_time.js" type="BINDATA" />
243 <include name="IDR_TASK_MANAGER_MEASURE_TIME_END_JS" file="resources\tas k_manager\measure_time_end.js" type="BINDATA" /> 246 <include name="IDR_TASK_MANAGER_MEASURE_TIME_END_JS" file="resources\tas k_manager\measure_time_end.js" type="BINDATA" />
244 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" />
245 </if> 247 </if>
246 <if expr="not pp_ifdef('chromeos')"> 248 <if expr="not pp_ifdef('chromeos')">
247 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo. js" flattenhtml="true" type="BINDATA" /> 249 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo. js" flattenhtml="true" type="BINDATA" />
248 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo\sync_prom o.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 250 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo\sync_prom o.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
249 </if> 251 </if>
250 <if expr="pp_ifdef('chromeos')"> 252 <if expr="pp_ifdef('chromeos')">
251 <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.ht ml" flattenhtml="true" type="BINDATA" /> 253 <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.ht ml" flattenhtml="true" type="BINDATA" />
252 <include name="IDR_BACKLOADER_MANIFEST" file="resources\backloader\manif est.json" type="BINDATA" /> 254 <include name="IDR_BACKLOADER_MANIFEST" file="resources\backloader\manif est.json" type="BINDATA" />
253 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\ choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type=" BINDATA" /> 255 <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\ choose_mobile_network.html" flattenhtml="true" allowexternalscript="true" type=" BINDATA" />
254 <include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\ch oose_mobile_network.js" type="BINDATA" /> 256 <include name="IDR_CHOOSE_MOBILE_NETWORK_JS" file="resources\chromeos\ch oose_mobile_network.js" type="BINDATA" />
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 314 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
313 </if> 315 </if>
314 <if expr="is_win"> 316 <if expr="is_win">
315 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 317 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
316 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 318 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
317 </if> 319 </if>
318 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 320 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
319 </includes> 321 </includes>
320 </release> 322 </release>
321 </grit> 323 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698