chrome/browser/browser_resources.grd - Issue 473583002: [Local NTP] Implementing Material Design styling

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

Issue 473583002: [Local NTP] Implementing Material Design styling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Removing Roboto; fixing theme compatibility; using .mv-mask for borders. Created 6 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

OLD	NEW
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>

(...skipping 196 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
207 <include name="IDR_LOCAL_NTP_DESIGN_JS" file="resources\local_ntp\local_nt p_design.js" flattenhtml="true" type="BINDATA" />	207 <include name="IDR_LOCAL_NTP_DESIGN_JS" file="resources\local_ntp\local_nt p_design.js" flattenhtml="true" type="BINDATA" />

208 <include name="IDR_MOST_VISITED_IFRAME_CSS" file="resources\local_ntp\most _visited_iframe.css" type="BINDATA" />	208 <include name="IDR_MOST_VISITED_IFRAME_CSS" file="resources\local_ntp\most _visited_iframe.css" type="BINDATA" />

209 <include name="IDR_MOST_VISITED_TITLE_HTML" file="resources\local_ntp\most _visited_title.html" type="BINDATA" />	209 <include name="IDR_MOST_VISITED_TITLE_HTML" file="resources\local_ntp\most _visited_title.html" type="BINDATA" />

210 <include name="IDR_MOST_VISITED_TITLE_CSS" file="resources\local_ntp\most_ visited_title.css" type="BINDATA" />	210 <include name="IDR_MOST_VISITED_TITLE_CSS" file="resources\local_ntp\most_ visited_title.css" type="BINDATA" />

211 <include name="IDR_MOST_VISITED_TITLE_JS" file="resources\local_ntp\most_v isited_title.js" type="BINDATA" />	211 <include name="IDR_MOST_VISITED_TITLE_JS" file="resources\local_ntp\most_v isited_title.js" type="BINDATA" />

212 <include name="IDR_MOST_VISITED_THUMBNAIL_HTML" file="resources\local_ntp\ most_visited_thumbnail.html" type="BINDATA" />	212 <include name="IDR_MOST_VISITED_THUMBNAIL_HTML" file="resources\local_ntp\ most_visited_thumbnail.html" type="BINDATA" />

213 <include name="IDR_MOST_VISITED_THUMBNAIL_CSS" file="resources\local_ntp\m ost_visited_thumbnail.css" type="BINDATA" />	213 <include name="IDR_MOST_VISITED_THUMBNAIL_CSS" file="resources\local_ntp\m ost_visited_thumbnail.css" type="BINDATA" />

214 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" />	214 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" />

215 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" />	215 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" />

216 <include name="IDR_MOST_VISITED_WINDOW_DISPOSITION_UTIL_JS" file="resource s\local_ntp\window_disposition_util.js" type="BINDATA" />	216 <include name="IDR_MOST_VISITED_WINDOW_DISPOSITION_UTIL_JS" file="resource s\local_ntp\window_disposition_util.js" type="BINDATA" />

217 <if expr="is_android">	217 <include name="IDR_ROBOTO_WOFF" file="resources\roboto\roboto.woff" type=" BINDATA" />
	Mathieu 2014/08/14 15:05:39 re-add is_android re-add is_android huangs 2014/08/14 15:50:21 Done. Show quoted text On 2014/08/14 15:05:39, Mathieu Perreault wrote: > re-add is_android Done.
218 <include name="IDR_ROBOTO_WOFF" file="resources\roboto\roboto.woff" type ="BINDATA" />	218 <include name="IDR_ROBOTO_WOFF2" file="resources\roboto\roboto.woff2" type ="BINDATA" />

219 <include name="IDR_ROBOTO_WOFF2" file="resources\roboto\roboto.woff2" ty pe="BINDATA" />

220 </if>

221 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />	219 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />

222 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />	220 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />

223 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />	221 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />

224 <include name="IDR_OMNIBOX_MOJO_JS" file="${omnibox_mojom_file}" use_base_ dir="false" type="BINDATA"/>	222 <include name="IDR_OMNIBOX_MOJO_JS" file="${omnibox_mojom_file}" use_base_ dir="false" type="BINDATA"/>

225 <if expr="not is_android">	223 <if expr="not is_android">

226 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />	224 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />

227 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " />	225 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " />

228 </if>	226 </if>

229 <include name="IDR_COMPONENTS_HTML" file="resources\components.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" />	227 <include name="IDR_COMPONENTS_HTML" file="resources\components.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" />

230 <include name="IDR_COMPONENTS_JS" file="resources\components.js" type="BIN DATA" />	228 <include name="IDR_COMPONENTS_JS" file="resources\components.js" type="BIN DATA" />

(...skipping 206 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
437 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />	435 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />

438 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />	436 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />

439 </if>	437 </if>

440 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />	438 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />

441 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />	439 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />

442 </if>	440 </if>

443 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />	441 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />

444 </includes>	442 </includes>

445 </release>	443 </release>

446 </grit>	444 </grit>

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/resources/local_ntp/local_ntp.css » ('j') | chrome/browser/search/local_ntp_source.cc » ('J')