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

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

Issue 182213002: Remove a duplicate include of about_welcome_android.css (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove image duplication Created 6 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 | Annotate | Revision Log
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 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
11 <if expr="not is_win and not is_macosx and not is_ios"> 11 <if expr="not is_win and not is_macosx and not is_ios">
12 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" /> 12 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" />
13 </if> 13 </if>
14 <if expr="is_macosx or is_ios"> 14 <if expr="is_macosx or is_ios">
15 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" /> 15 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" />
16 </if> 16 </if>
17 <if expr="is_win"> 17 <if expr="is_win">
18 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" /> 18 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" />
19 </if> 19 </if>
20 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" t ype="chrome_html" /> 20 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" t ype="chrome_html" />
21 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm l" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> 21 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm l" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
22 <if expr="is_android"> 22 <if expr="is_android">
23 <structure name="IDR_ABOUT_WELCOME_HTML" file="resources\about_welcome_a ndroid\about_welcome_android.html" flattenhtml="true" type="chrome_html" /> 23 <structure name="IDR_ABOUT_WELCOME_HTML" file="resources\about_welcome_a ndroid\about_welcome_android.html" flattenhtml="true" type="chrome_html" />
24 <structure name="IDR_ABOUT_WELCOME_CSS" file="resources\about_welcome_an droid\about_welcome_android.css" flattenhtml="true" type="chrome_html" />
Nico 2014/03/04 00:09:21 Add "Remove unused IDR_ABOUT_WELCOME_CSS; the css
25 </if> 24 </if>
26 <if expr="enable_app_list"> 25 <if expr="enable_app_list">
27 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" /> 26 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" />
28 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\ start_page.html" flattenhtml="true" type="chrome_html" /> 27 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\ start_page.html" flattenhtml="true" type="chrome_html" />
29 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st art_page.js" flattenhtml="true" type="chrome_html" /> 28 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st art_page.js" flattenhtml="true" type="chrome_html" />
30 <structure name="IDR_APP_LIST_HOTWORD_NACL_NMF" file="resources\app_list \hotword_nacl.nmf" flattenhtml="true" type="chrome_html" /> 29 <structure name="IDR_APP_LIST_HOTWORD_NACL_NMF" file="resources\app_list \hotword_nacl.nmf" flattenhtml="true" type="chrome_html" />
31 </if> 30 </if>
32 <if expr="chromeos"> 31 <if expr="chromeos">
33 <structure name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\logi n\demo_user_login.html" flattenhtml="true" type="chrome_html" /> 32 <structure name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\logi n\demo_user_login.html" flattenhtml="true" type="chrome_html" />
34 <structure name="IDR_DEMO_USER_LOGIN_JS" file="resources\chromeos\login\ demo_user_login.js" flattenhtml="true" type="chrome_html" /> 33 <structure name="IDR_DEMO_USER_LOGIN_JS" file="resources\chromeos\login\ demo_user_login.js" flattenhtml="true" type="chrome_html" />
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatt enhtml="true" type="chrome_html" /> 93 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatt enhtml="true" type="chrome_html" />
95 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="B INDATA" /> 94 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="B INDATA" />
96 </if> 95 </if>
97 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 96 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
98 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" /> 97 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" />
99 <if expr="not is_android"> 98 <if expr="not is_android">
100 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys\about_sys.h tml" flattenhtml="true" type="BINDATA" /> 99 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys\about_sys.h tml" flattenhtml="true" type="BINDATA" />
101 </if> 100 </if>
102 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" /> 101 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" />
103 <include name="IDR_ABOUT_VERSION_CSS" file="resources\about_version.css" t ype="BINDATA" /> 102 <include name="IDR_ABOUT_VERSION_CSS" file="resources\about_version.css" t ype="BINDATA" />
104 <if expr="is_android"> 103
105 <include name="IDR_ABOUT_WELCOME_JS" file="resources\about_welcome_andro id\about_welcome_android.js" type="BINDATA" />
106 </if>
107 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 104 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
108 <if expr="enable_enhanced_bookmarks"> 105 <if expr="enable_enhanced_bookmarks">
109 <include name="IDR_ENHANCED_BOOKMARKS_MANIFEST" file="resources\enhanced _bookmark_manager\manifest.json" type="BINDATA" /> 106 <include name="IDR_ENHANCED_BOOKMARKS_MANIFEST" file="resources\enhanced _bookmark_manager\manifest.json" type="BINDATA" />
110 </if> 107 </if>
111 <if expr="is_posix and not is_macosx and not is_ios"> 108 <if expr="is_posix and not is_macosx and not is_ios">
112 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" /> 109 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" />
113 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 110 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
114 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 111 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
115 </if> 112 </if>
116 <if expr="enable_app_list"> 113 <if expr="enable_app_list">
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" /> 420 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" />
424 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" /> 421 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" />
425 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" /> 422 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" />
426 </if> 423 </if>
427 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" /> 424 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" />
428 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" /> 425 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" />
429 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" /> 426 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" />
430 </includes> 427 </includes>
431 </release> 428 </release>
432 </grit> 429 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698