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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10828140: Upstream about:welcome page for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « no previous file | chrome/browser/resources/about_welcome_android/about_welcome_android.css » ('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">
11 <structures> 11 <structures>
12 <if expr="is_posix and not is_macosx"> 12 <if expr="is_posix and not is_macosx">
13 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" /> 13 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" />
14 </if> 14 </if>
15 <if expr="is_macosx"> 15 <if expr="is_macosx">
16 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" /> 16 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" />
17 </if> 17 </if>
18 <if expr="is_win"> 18 <if expr="is_win">
19 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" /> 19 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" />
20 </if> 20 </if>
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="pp_ifdef('android')">
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" />
25 </if>
22 <if expr="pp_ifdef('chromeos')"> 26 <if expr="pp_ifdef('chromeos')">
23 <structure name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\logi n\demo_user_login.html" flattenhtml="true" type="chrome_html" /> 27 <structure name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\logi n\demo_user_login.html" flattenhtml="true" type="chrome_html" />
24 </if> 28 </if>
25 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.cs s" flattenhtml="true" type="chrome_html" /> 29 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.cs s" flattenhtml="true" type="chrome_html" />
26 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.h tml" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> 30 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.h tml" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
27 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extension s.html" flattenhtml="true" type="chrome_html" /> 31 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extension s.html" flattenhtml="true" type="chrome_html" />
28 <structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml= "true" type="chrome_html" /> 32 <structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtml= "true" type="chrome_html" />
29 <structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtm l="true" type="chrome_html" /> 33 <structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenhtm l="true" type="chrome_html" />
30 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.htm l" flattenhtml="true" type="chrome_html" /> 34 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.htm l" flattenhtml="true" type="chrome_html" />
31 <if expr="pp_ifdef('chromeos')"> 35 <if expr="pp_ifdef('chromeos')">
(...skipping 18 matching lines...) Expand all
50 </if> 54 </if>
51 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 55 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
52 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" /> 56 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" />
53 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" type= "BINDATA" /> 57 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" type= "BINDATA" />
54 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" /> 58 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" />
55 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatten html="true" type="chrome_html" /> 59 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatten html="true" type="chrome_html" />
56 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="BIN DATA" /> 60 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="BIN DATA" />
57 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 61 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
58 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" /> 62 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" />
59 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" /> 63 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" />
64 <if expr="pp_ifdef('android')">
65 <include name="IDR_ABOUT_WELCOME_JS" file="resources\about_welcome_andro id\about_welcome_android.js" type="BINDATA" />
66 </if>
60 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 67 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
61 <if expr="is_posix and not is_macosx"> 68 <if expr="is_posix and not is_macosx">
62 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" /> 69 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" />
63 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 70 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
64 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 71 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
65 </if> 72 </if>
66 <if expr="pp_ifdef('enable_printing')"> 73 <if expr="pp_ifdef('enable_printing')">
67 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" /> 74 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" />
68 <include name="IDR_CLOUD_PRINT_SETUP_DONE_HTML" file="resources\cloud_pr int\cloud_print_setup_done.html" flattenhtml="true" type="BINDATA" /> 75 <include name="IDR_CLOUD_PRINT_SETUP_DONE_HTML" file="resources\cloud_pr int\cloud_print_setup_done.html" flattenhtml="true" type="BINDATA" />
69 <include name="IDR_CLOUD_PRINT_SETUP_FLOW_HTML" file="resources\cloud_pr int\cloud_print_setup_flow.html" flattenhtml="true" type="BINDATA" /> 76 <include name="IDR_CLOUD_PRINT_SETUP_FLOW_HTML" file="resources\cloud_pr int\cloud_print_setup_flow.html" flattenhtml="true" type="BINDATA" />
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 249 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
243 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 250 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
244 </if> 251 </if>
245 <if expr="is_win"> 252 <if expr="is_win">
246 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 253 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
247 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 254 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
248 </if> 255 </if>
249 </includes> 256 </includes>
250 </release> 257 </release>
251 </grit> 258 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/about_welcome_android/about_welcome_android.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698