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

Side by Side Diff: components/resources/ntp_tiles_resources.grdp

Issue 2695713004: Add baked-in favicons for default popular sites on NTP (Closed)
Patch Set: Rebase. Created 3 years, 9 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 | « components/ntp_tiles/resources/default_popular_sites.json ('k') | no next file » | 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-part> 2 <grit-part>
3 <if expr="is_android or is_ios"> 3 <if expr="is_android or is_ios">
4 <include name="IDR_POPULAR_SITES_INTERNALS_HTML" file="../ntp_tiles/webui/re sources/popular_sites_internals.html" flattenhtml="true" allowexternalscript="tr ue" type="BINDATA" /> 4 <include name="IDR_POPULAR_SITES_INTERNALS_HTML" file="../ntp_tiles/webui/re sources/popular_sites_internals.html" flattenhtml="true" allowexternalscript="tr ue" type="BINDATA" />
5 <include name="IDR_POPULAR_SITES_INTERNALS_JS" file="../ntp_tiles/webui/reso urces/popular_sites_internals.js" type="BINDATA" /> 5 <include name="IDR_POPULAR_SITES_INTERNALS_JS" file="../ntp_tiles/webui/reso urces/popular_sites_internals.js" type="BINDATA" />
6 <include name="IDR_POPULAR_SITES_INTERNALS_CSS" file="../ntp_tiles/webui/res ources/popular_sites_internals.css" type="BINDATA" /> 6 <include name="IDR_POPULAR_SITES_INTERNALS_CSS" file="../ntp_tiles/webui/res ources/popular_sites_internals.css" type="BINDATA" />
7 <include name="IDR_DEFAULT_POPULAR_SITES_JSON" file="../ntp_tiles/resources/ default_popular_sites.json" type="BINDATA" /> 7 <if expr="_google_chrome">
8 <then>
9 <include name="IDR_DEFAULT_POPULAR_SITES_JSON" file="../ntp_tiles/resour ces/internal/default_popular_sites.json" type="BINDATA" />
10 <include name="IDR_DEFAULT_POPULAR_SITES_ICON0" file="../ntp_tiles/resou rces/internal/icon0.png" type="BINDATA" />
11 <include name="IDR_DEFAULT_POPULAR_SITES_ICON1" file="../ntp_tiles/resou rces/internal/icon1.png" type="BINDATA" />
12 <include name="IDR_DEFAULT_POPULAR_SITES_ICON2" file="../ntp_tiles/resou rces/internal/icon2.png" type="BINDATA" />
13 <include name="IDR_DEFAULT_POPULAR_SITES_ICON3" file="../ntp_tiles/resou rces/internal/icon3.png" type="BINDATA" />
14 <include name="IDR_DEFAULT_POPULAR_SITES_ICON4" file="../ntp_tiles/resou rces/internal/icon4.png" type="BINDATA" />
15 <include name="IDR_DEFAULT_POPULAR_SITES_ICON5" file="../ntp_tiles/resou rces/internal/icon5.png" type="BINDATA" />
16 <include name="IDR_DEFAULT_POPULAR_SITES_ICON6" file="../ntp_tiles/resou rces/internal/icon6.png" type="BINDATA" />
17 <include name="IDR_DEFAULT_POPULAR_SITES_ICON7" file="../ntp_tiles/resou rces/internal/icon7.png" type="BINDATA" />
18 </then>
19 <else>
20 <!-- Fall back to a local resource so popular sites can be tested proper ly. -->
21 <include name="IDR_DEFAULT_POPULAR_SITES_JSON" file="../ntp_tiles/resour ces/default_popular_sites.json" type="BINDATA" />
22 </else>
23 </if>
8 </if> 24 </if>
9 <include name="IDR_NTP_TILES_INTERNALS_HTML" file="../ntp_tiles/webui/resource s/ntp_tiles_internals.html" flattenhtml="true" allowexternalscript="true" type=" BINDATA" /> 25 <include name="IDR_NTP_TILES_INTERNALS_HTML" file="../ntp_tiles/webui/resource s/ntp_tiles_internals.html" flattenhtml="true" allowexternalscript="true" type=" BINDATA" />
10 <include name="IDR_NTP_TILES_INTERNALS_JS" file="../ntp_tiles/webui/resources/ ntp_tiles_internals.js" type="BINDATA" /> 26 <include name="IDR_NTP_TILES_INTERNALS_JS" file="../ntp_tiles/webui/resources/ ntp_tiles_internals.js" type="BINDATA" />
11 <include name="IDR_NTP_TILES_INTERNALS_CSS" file="../ntp_tiles/webui/resources /ntp_tiles_internals.css" type="BINDATA" /> 27 <include name="IDR_NTP_TILES_INTERNALS_CSS" file="../ntp_tiles/webui/resources /ntp_tiles_internals.css" type="BINDATA" />
12 </grit-part> 28 </grit-part>
OLDNEW
« no previous file with comments | « components/ntp_tiles/resources/default_popular_sites.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698