summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/filebrowse.html
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-09 16:58:50 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-09 16:58:50 +0000
commit6b4583fef71394eb1f2fc57250e89b1c4db8bb4b (patch)
tree74f311638bbc67ab31b6a4468a02aed0615eaa1a /chrome/browser/resources/filebrowse.html
parentf58b91ff62f64e679dc453825e8a2f89bcba2855 (diff)
downloadchromium_src-6b4583fef71394eb1f2fc57250e89b1c4db8bb4b.zip
chromium_src-6b4583fef71394eb1f2fc57250e89b1c4db8bb4b.tar.gz
chromium_src-6b4583fef71394eb1f2fc57250e89b1c4db8bb4b.tar.bz2
Make the content browser in ChromeOS honor the DOM UI font setting.
At the moment, no font-family is specified. In that case, serif font is picked by default by Chrome (exception being CJK for which sans-serif is picked). Adding an attribute i18n-values for font-family will set up font-family for the file. I'm not setting font-size because filebrowse.html uses em font-size widely and the default value of 84% (set in locale_settings_cros.grd) will disrupt the layout. Change the DOM UI font for ChromeOS from 'Droid Sans' to 'Chrome Droid Sans'. This may change again, but this matches the font used in the native UI (as specified in gtkrc file) for now. In addition, just as a 'sanitization', enclose font names (IDS_WEB_FONT_FAMILY) with a space with a pair of single quotation marks. BUG=chromiumos:6067 (http://crosbug.com/6067) TEST=Build Chrome for ChromeOS and gmerge it to your build. Content browser does not use serif font any more. Instead, it uses 'Chrome Droid Sans'. Review URL: http://codereview.chromium.org/3295010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/filebrowse.html')
-rw-r--r--chrome/browser/resources/filebrowse.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/resources/filebrowse.html b/chrome/browser/resources/filebrowse.html
index b2c0f3c..4588943 100644
--- a/chrome/browser/resources/filebrowse.html
+++ b/chrome/browser/resources/filebrowse.html
@@ -1582,7 +1582,8 @@ function createNewList(title, results, main, path) {
}
</script>
-<body onload='load();' onclick='clearMenus()' onselectstart='return false'>
+<body onload='load();' onclick='clearMenus()' onselectstart='return false'
+ i18n-values=".style.fontFamily:fontfamily">
<div id='header' class=''>
<div id='back' class='backbutton controlbutton' onclick='goBackInList();return false;'>
<img src="shared/images/filebrowse_back.png" width='100%' height='100%'>