Commit af7381ce authored by jshin's avatar jshin Committed by Commit bot

Remove Roboto fonts from the resource bundle

This should go in after
https://chromium-review.googlesource.com/#/c/349730/ is landed.

Update install-chromeos-fonts.py to install the latest notofonts
and roboto font packages for CrOS.

R=dzhioev
BUG=617281
TEST=OOBE screen still use Roboto
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation;master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2043883004
Cr-Commit-Position: refs/heads/master@{#406034}
parent 078a84e8
......@@ -19,10 +19,10 @@ URL_TEMPLATE = ('https://commondatastorage.googleapis.com/chromeos-localmirror/'
SOURCES = [
{
'name': 'notofonts',
'version': '20150706'
'version': '20160310'
}, {
'name': 'robotofonts',
'version': '20150625'
'version': '2.132'
}
]
......
......@@ -94,15 +94,6 @@
<include name="IDR_APPS_FOLDER_OVERLAY_128" file="mac/apps_folder_overlay_128.png" type="BINDATA" />
<include name="IDR_APPS_FOLDER_OVERLAY_512" file="mac/apps_folder_overlay_512.png" type="BINDATA" />
</if>
<if expr="chromeos">
<!-- TODO(dzhioev): Remove when we have Roboto among system fonts.
http://crbug.com/409047 -->
<include name="IDR_FONT_ROBOTO_THIN" file="Roboto-Thin.ttf" type="BINDATA" />
<include name="IDR_FONT_ROBOTO_LIGHT" file="Roboto-Light.ttf" type="BINDATA" />
<include name="IDR_FONT_ROBOTO_REGULAR" file="Roboto-Regular.ttf" type="BINDATA" />
<include name="IDR_FONT_ROBOTO_MEDIUM" file="Roboto-Medium.ttf" type="BINDATA" />
<include name="IDR_FONT_ROBOTO_BOLD" file="Roboto-Bold.ttf" type="BINDATA" />
</if>
</includes>
</release>
</grit>
......@@ -11,7 +11,6 @@
<include src="login_non_lock_shared.html">
<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
<link rel="import" href="chrome://oobe/custom_elements.html">
<link rel="stylesheet" href="roboto_font.css">
<link rel="stylesheet" href="accessibility_menu.css">
<script src="chrome://oobe/oobe.js"></script>
<script src="chrome://oobe/gaia_auth_host.js"></script>
......
/* Copyright 2014 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
/* TODO(dzhioev): get rid of this file, when we have Roboto among system fonts.
* http://crbug.com/409047
*/
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 100;
src: url(Roboto-Thin.ttf) format('truetype');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: url(Roboto-Light.ttf) format('truetype');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url(Roboto-Regular.ttf) format('truetype');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 500;
src: url(Roboto-Medium.ttf) format('truetype');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: url(Roboto-Bold.ttf) format('truetype');
}
......@@ -160,14 +160,6 @@ content::WebUIDataSource* CreateOobeUIDataSource(
source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS);
source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS);
if (display_type == OobeUI::kOobeDisplay) {
source->AddResourcePath("Roboto-Thin.ttf", IDR_FONT_ROBOTO_THIN);
source->AddResourcePath("Roboto-Light.ttf", IDR_FONT_ROBOTO_LIGHT);
source->AddResourcePath("Roboto-Regular.ttf", IDR_FONT_ROBOTO_REGULAR);
source->AddResourcePath("Roboto-Medium.ttf", IDR_FONT_ROBOTO_MEDIUM);
source->AddResourcePath("Roboto-Bold.ttf", IDR_FONT_ROBOTO_BOLD);
}
// Only add a filter when runing as test.
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
const bool is_running_test = command_line->HasSwitch(::switches::kTestName) ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment