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

Side by Side Diff: ui/webui/resources/webui_resources.grd

Issue 2160303003: Do not bundle Roboto on CrOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix vulcanized version for download ui Created 4 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
« no previous file with comments | « ui/webui/resources/css/roboto.css ('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 <!-- This comment is only here because changes to resources are not picked up 2 <!-- This comment is only here because changes to resources are not picked up
3 without changes to the corresponding grd file. --> 3 without changes to the corresponding grd file. -->
4 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false"> 4 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">
5 <outputs> 5 <outputs>
6 <output filename="grit/webui_resources.h" type="rc_header"> 6 <output filename="grit/webui_resources.h" type="rc_header">
7 <emit emit_type='prepend'></emit> 7 <emit emit_type='prepend'></emit>
8 </output> 8 </output>
9 <output filename="grit/webui_resources_map.cc" 9 <output filename="grit/webui_resources_map.cc"
10 type="resource_file_map_source" /> 10 type="resource_file_map_source" />
11 <output filename="grit/webui_resources_map.h" type="resource_map_header" /> 11 <output filename="grit/webui_resources_map.h" type="resource_map_header" />
12 <output filename="webui_resources.pak" type="data_package" /> 12 <output filename="webui_resources.pak" type="data_package" />
13 </outputs> 13 </outputs>
14 <release seq="1"> 14 <release seq="1">
15 <includes> 15 <includes>
16 <include name="IDR_WEBUI_I18N_TEMPLATE_JS" file="js/i18n_template.js" flat tenhtml="true" type="BINDATA" /> 16 <include name="IDR_WEBUI_I18N_TEMPLATE_JS" file="js/i18n_template.js" flat tenhtml="true" type="BINDATA" />
17 <include name="IDR_WEBUI_JSTEMPLATE_JS" file="js/jstemplate_compiled.js" f lattenhtml="true" type="BINDATA" /> 17 <include name="IDR_WEBUI_JSTEMPLATE_JS" file="js/jstemplate_compiled.js" f lattenhtml="true" type="BINDATA" />
18 <include name="IDR_WEBUI_ANALYTICS_JS" file="js/analytics.js" flattenhtml= "true" type="BINDATA" /> 18 <include name="IDR_WEBUI_ANALYTICS_JS" file="js/analytics.js" flattenhtml= "true" type="BINDATA" />
19 <!-- Roboto Font. Roboto-Regular and Roboto-Light is already available on 19 <!-- Roboto Font. Roboto-Regular and Roboto-Light is already available on
20 Android, and Roboto-Medium is not used on Android. --> 20 Android, and Roboto-Medium is not used on Android. All 6 weights of
21 <if expr="not android"> 21 Roboto are available on Chrome OS.-->
22 <if expr="not android and not chromeos">
22 <include name="IDR_WEBUI_ROBOTO_ROBOTO_REGULAR_WOFF2" file="roboto/robot o-regular.woff2" type="BINDATA" /> 23 <include name="IDR_WEBUI_ROBOTO_ROBOTO_REGULAR_WOFF2" file="roboto/robot o-regular.woff2" type="BINDATA" />
23 <include name="IDR_WEBUI_ROBOTO_ROBOTO_MEDIUM_WOFF2" file="roboto/roboto -medium.woff2" type="BINDATA" /> 24 <include name="IDR_WEBUI_ROBOTO_ROBOTO_MEDIUM_WOFF2" file="roboto/roboto -medium.woff2" type="BINDATA" />
24 <include name="IDR_WEBUI_ROBOTO_ROBOTO_BOLD_WOFF2" file="roboto/roboto-b old.woff2" type="BINDATA" /> 25 <include name="IDR_WEBUI_ROBOTO_ROBOTO_BOLD_WOFF2" file="roboto/roboto-b old.woff2" type="BINDATA" />
25 </if> 26 </if>
26 27
27 <!-- Component apps common image resources - 1x --> 28 <!-- Component apps common image resources - 1x -->
28 <!-- White button --> 29 <!-- White button -->
29 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON" 30 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON"
30 file="../../views/resources/default_100_percent/common/button.png " type="BINDATA" /> 31 file="../../views/resources/default_100_percent/common/button.png " type="BINDATA" />
31 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_PRESSED" 32 <include name="IDR_WEBUI_IMAGES_APPS_BUTTON_PRESSED"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 <structure name="IDR_WEBUI_CSS_MENU_BUTTON" 234 <structure name="IDR_WEBUI_CSS_MENU_BUTTON"
234 file="css/menu_button.css" type="chrome_html" 235 file="css/menu_button.css" type="chrome_html"
235 flattenhtml="true" /> 236 flattenhtml="true" />
236 <structure name="IDR_WEBUI_CSS_TEXT_DEFAULTS" 237 <structure name="IDR_WEBUI_CSS_TEXT_DEFAULTS"
237 file="css/text_defaults.css" type="chrome_html" /> 238 file="css/text_defaults.css" type="chrome_html" />
238 <structure name="IDR_WEBUI_CSS_TEXT_DEFAULTS_MD" 239 <structure name="IDR_WEBUI_CSS_TEXT_DEFAULTS_MD"
239 file="css/text_defaults_md.css" type="chrome_html" /> 240 file="css/text_defaults_md.css" type="chrome_html" />
240 <structure name="IDR_WEBUI_CSS_OVERLAY" 241 <structure name="IDR_WEBUI_CSS_OVERLAY"
241 file="css/overlay.css" type="chrome_html" 242 file="css/overlay.css" type="chrome_html"
242 flattenhtml="true" /> 243 flattenhtml="true" />
243 <structure name="IDR_WEBUI_CSS_ROBOTO" 244 <structure name="IDR_WEBUI_CSS_ROBOTO" preprocess="true"
244 file="css/roboto.css" type="chrome_html" /> 245 file="css/roboto.css" type="chrome_html" />
245 <structure name="IDR_WEBUI_CSS_SPINNER" 246 <structure name="IDR_WEBUI_CSS_SPINNER"
246 file="css/spinner.css" type="chrome_html" 247 file="css/spinner.css" type="chrome_html"
247 flattenhtml="true" /> 248 flattenhtml="true" />
248 <structure name="IDR_WEBUI_CSS_TABLE" 249 <structure name="IDR_WEBUI_CSS_TABLE"
249 file="css/table.css" type="chrome_html" /> 250 file="css/table.css" type="chrome_html" />
250 <structure name="IDR_WEBUI_CSS_TABS" 251 <structure name="IDR_WEBUI_CSS_TABS"
251 file="css/tabs.css" type="chrome_html" /> 252 file="css/tabs.css" type="chrome_html" />
252 <structure name="IDR_WEBUI_CSS_THROBBER" 253 <structure name="IDR_WEBUI_CSS_THROBBER"
253 file="css/throbber.css" type="chrome_html" /> 254 file="css/throbber.css" type="chrome_html" />
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 file="js/chromeos/ui_account_tweaks.js" 464 file="js/chromeos/ui_account_tweaks.js"
464 type="chrome_html" /> 465 type="chrome_html" />
465 </if> 466 </if>
466 <part file="cr_elements_resources.grdp" /> 467 <part file="cr_elements_resources.grdp" />
467 <if expr="not is_android"> 468 <if expr="not is_android">
468 <part file="polymer_resources.grdp" /> 469 <part file="polymer_resources.grdp" />
469 </if> 470 </if>
470 </structures> 471 </structures>
471 </release> 472 </release>
472 </grit> 473 </grit>
OLDNEW
« no previous file with comments | « ui/webui/resources/css/roboto.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698