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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/webui/resources/css/roboto.css ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/webui/resources/webui_resources.grd
diff --git a/ui/webui/resources/webui_resources.grd b/ui/webui/resources/webui_resources.grd
index 6ce564c2493ce81d7f378aec568699c06bb3ba67..71f75ed89a94df95f07aab38259a740ee1306746 100644
--- a/ui/webui/resources/webui_resources.grd
+++ b/ui/webui/resources/webui_resources.grd
@@ -17,8 +17,9 @@ without changes to the corresponding grd file. -->
<include name="IDR_WEBUI_JSTEMPLATE_JS" file="js/jstemplate_compiled.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_WEBUI_ANALYTICS_JS" file="js/analytics.js" flattenhtml="true" type="BINDATA" />
<!-- Roboto Font. Roboto-Regular and Roboto-Light is already available on
- Android, and Roboto-Medium is not used on Android. -->
- <if expr="not android">
+ Android, and Roboto-Medium is not used on Android. All 6 weights of
+ Roboto are available on Chrome OS.-->
+ <if expr="not android and not chromeos">
<include name="IDR_WEBUI_ROBOTO_ROBOTO_REGULAR_WOFF2" file="roboto/roboto-regular.woff2" type="BINDATA" />
<include name="IDR_WEBUI_ROBOTO_ROBOTO_MEDIUM_WOFF2" file="roboto/roboto-medium.woff2" type="BINDATA" />
<include name="IDR_WEBUI_ROBOTO_ROBOTO_BOLD_WOFF2" file="roboto/roboto-bold.woff2" type="BINDATA" />
@@ -240,7 +241,7 @@ without changes to the corresponding grd file. -->
<structure name="IDR_WEBUI_CSS_OVERLAY"
file="css/overlay.css" type="chrome_html"
flattenhtml="true" />
- <structure name="IDR_WEBUI_CSS_ROBOTO"
+ <structure name="IDR_WEBUI_CSS_ROBOTO" preprocess="true"
file="css/roboto.css" type="chrome_html" />
<structure name="IDR_WEBUI_CSS_SPINNER"
file="css/spinner.css" type="chrome_html"
« 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