commit 4ed0d4123ed0f9a2defbe13069880f26dd9de3ab
Author: dbeam <
[email protected]>
AuthorDate: Fri Mar 04 21:21:15 2016
Commit: Commit bot <
[email protected]>
CommitDate: Fri Mar 04 21:22:49 2016
MD History/Downloads: use MD-specific text defaults (like other MD UIs)
R=
[email protected]
BUG=589630
Review URL:
https://codereview.chromium.org/1758913004
Cr-Commit-Position: refs/heads/master@{#379358}
diff --git a/chrome/browser/resources/md_downloads/crisper.js b/chrome/browser/resources/md_downloads/crisper.js
index 0c4f256..4c03152 100644
--- a/chrome/browser/resources/md_downloads/crisper.js
+++ b/chrome/browser/resources/md_downloads/crisper.js
@@ -1061,25 +1061,6 @@
}
/**
- * Calls chrome.send with a callback and restores the original afterwards.
- * @param {string} name The name of the message to send.
- * @param {!Array} params The parameters to send.
- * @param {string} callbackName The name of the function that the backend calls.
- * @param {!Function} callback The function to call.
- */
-function chromeSend(name, params, callbackName, callback) {
- var old = global[callbackName];
- global[callbackName] = function() {
- // restore
- global[callbackName] = old;
-
- var args = Array.prototype.slice.call(arguments);
- return callback.apply(global, args);
- };
- chrome.send(name, params);
-}
-
-/**
* Returns the scale factors supported by this platform for webui
* resources.
* @return {Array} The supported scale factors.
diff --git a/chrome/browser/resources/md_downloads/downloads.html b/chrome/browser/resources/md_downloads/downloads.html
index 750fc62..6b4f4e5 100644
--- a/chrome/browser/resources/md_downloads/downloads.html
+++ b/chrome/browser/resources/md_downloads/downloads.html
@@ -3,8 +3,7 @@
<head>
<meta charset="utf-8">
<title i18n-content="title"></title>
- <link rel="stylesheet" href="chrome://resources/css/roboto.css">
- <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
+ <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
<style>
html {
background: rgb(236, 239, 241);
@@ -17,8 +16,6 @@
body {
display: flex;
- font-family: Roboto;
- font-size: 81.25%;
margin: 0;
}
</style>
diff --git a/chrome/browser/resources/md_downloads/vulcanize.py b/chrome/browser/resources/md_downloads/vulcanize.py
index acb3a5d..3ef22dc 100755
--- a/chrome/browser/resources/md_downloads/vulcanize.py
+++ b/chrome/browser/resources/md_downloads/vulcanize.py
@@ -41,6 +41,7 @@
'--exclude', 'load_time_data.js',
'--exclude', 'strings.js',
'--exclude', 'text_defaults.css',
+ '--exclude', 'text_defaults_md.css',
'--inline-css',
'--inline-scripts',
diff --git a/chrome/browser/resources/md_downloads/vulcanized.html b/chrome/browser/resources/md_downloads/vulcanized.html
index 1aa9e4e..7010722 100644
--- a/chrome/browser/resources/md_downloads/vulcanized.html
+++ b/chrome/browser/resources/md_downloads/vulcanized.html
@@ -25,37 +25,7 @@
-->
<meta charset="utf-8">
<title i18n-content="title"></title>
- <style>
-/* Copyright 2015 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. */
-
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- src: local('Roboto Light'), local('Roboto-Light'),
- url("chrome://resources/roboto/roboto-light.woff2") format('woff2');
-}
-
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- src: local('Roboto'), local('Roboto-Regular'),
- url("chrome://resources/roboto/roboto-regular.woff2") format('woff2');
-}
-
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 500;
- src: local('Roboto Medium'), local('Roboto-Medium'),
- url("chrome://resources/roboto/roboto-medium.woff2") format('woff2');
-}
-
-</style>
- <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
+ <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
<style>
html {
background: rgb(236, 239, 241);
@@ -68,8 +38,6 @@
body {
display: flex;
- font-family: Roboto;
- font-size: 81.25%;
margin: 0;
}
</style>
diff --git a/chrome/browser/resources/md_history/history.html b/chrome/browser/resources/md_history/history.html
index 4cdb805..182ac8f 100644
--- a/chrome/browser/resources/md_history/history.html
+++ b/chrome/browser/resources/md_history/history.html
@@ -4,8 +4,7 @@
<meta charset="utf8">
<title i18n-content="title"></title>
- <link rel="stylesheet" href="chrome://resources/css/roboto.css">
- <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
+ <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
<style>
html,
@@ -18,8 +17,6 @@
background: #f2f2f2;
display: flex;
flex-direction: column;
- font-family: Roboto;
- font-size: 13px;
}
#toolbar {