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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10831317: Upstream Android NTP resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved .png files to separate CL 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/ntp_android/bookmarks.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">
(...skipping 14 matching lines...) Expand all
25 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.cs s" flattenhtml="true" type="chrome_html" /> 25 <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" /> 26 <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" /> 27 <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" /> 28 <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" /> 29 <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" /> 30 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.htm l" flattenhtml="true" type="chrome_html" />
31 <if expr="pp_ifdef('chromeos')"> 31 <if expr="pp_ifdef('chromeos')">
32 <structure name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.ht ml" flattenhtml="true" type="chrome_html" /> 32 <structure name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.ht ml" flattenhtml="true" type="chrome_html" />
33 </if> 33 </if>
34 <structure name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_inco gnito_tab_theme.css" flattenhtml="true" type="chrome_html" /> 34 <structure name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_inco gnito_tab_theme.css" flattenhtml="true" type="chrome_html" />
35 <structure name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" fl attenhtml="true" type="chrome_html" /> 35 <if expr="not pp_ifdef('android')">
36 <structure name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_the me.css" flattenhtml="true" type="chrome_html" /> 36 <structure name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flattenhtml="true" type="chrome_html" />
37 <structure name="IDR_NEW_TAB_SEARCH_HTML" file="resources\ntp_search\new_t ab.html" flattenhtml="true" type="chrome_html" /> 37 <structure name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_t heme.css" flattenhtml="true" type="chrome_html" />
38 <structure name="IDR_NEW_TAB_SEARCH_THEME_CSS" file="resources\ntp_search\ new_tab_theme.css" flattenhtml="true" type="chrome_html" /> 38 <structure name="IDR_NEW_TAB_SEARCH_HTML" file="resources\ntp_search\new _tab.html" flattenhtml="true" type="chrome_html" />
39 <structure name="IDR_NEW_TAB_SEARCH_THEME_CSS" file="resources\ntp_searc h\new_tab_theme.css" flattenhtml="true" type="chrome_html" />
40 </if>
41 <if expr="pp_ifdef('android')">
42 <structure name="IDR_NEW_TAB_ANDROID_HTML" file="resources\ntp_android\n ew_tab.html" flattenhtml="true" type="chrome_html" />
43 </if>
39 <if expr="pp_ifdef('chromeos')"> 44 <if expr="pp_ifdef('chromeos')">
40 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" /> 45 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" />
41 </if> 46 </if>
42 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" /> 47 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />
43 <structure name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flatt enhtml="true" type="chrome_html" /> 48 <structure name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flatt enhtml="true" type="chrome_html" />
44 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.ht ml" flattenhtml="true" type="chrome_html" /> 49 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.ht ml" flattenhtml="true" type="chrome_html" />
45 </structures> 50 </structures>
46 <includes> 51 <includes>
47 <if expr="is_win"> 52 <if expr="is_win">
48 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 53 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 244 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
240 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 245 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
241 </if> 246 </if>
242 <if expr="is_win"> 247 <if expr="is_win">
243 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 248 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
244 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 249 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
245 </if> 250 </if>
246 </includes> 251 </includes>
247 </release> 252 </release>
248 </grit> 253 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/ntp_android/bookmarks.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698