summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authorjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-03 21:30:51 +0000
committerjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-03 21:30:51 +0000
commit243ed6775d053407531a16ce1bf986f1df697f62 (patch)
tree5d8b46fa35fcf4c2dcf65652488fc914a4235ecf /chrome/browser/resources
parent1c370c041ab3333d091efdfbbc814853934d574d (diff)
downloadchromium_src-243ed6775d053407531a16ce1bf986f1df697f62.zip
chromium_src-243ed6775d053407531a16ce1bf986f1df697f62.tar.gz
chromium_src-243ed6775d053407531a16ce1bf986f1df697f62.tar.bz2
Make the font family and the font size used in dom UI localizable. This is a part 1 of the fix for bug 7319 and will be followed by part 2 for non-DOM UI.
For some Indian languages (Malayalam, Bengali and Telugu), we have to use a bigger size and a font family for that script on Windows. This is because Windows' stock fonts for those scripts are smaller than fonts for other scripts at a given size. I removed 'WEB' style in chrome_font.h because it's not used anywhere any more after our switch to the html UI. In addition, IDS_WEB_FONT_FAMILY is recycled to localize the font family (or the list of font families) for html UI. I also back-ported the support for setting 'style.fooBar' property to our copy of Jstemplate (JstProcessor.prototype.jstValues_). BUG=7319 Review URL: http://codereview.chromium.org/57025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/downloads.html6
-rw-r--r--chrome/browser/resources/history.html6
-rw-r--r--chrome/browser/resources/incognito_tab.html4
-rw-r--r--chrome/browser/resources/new_tab.html5
4 files changed, 7 insertions, 14 deletions
diff --git a/chrome/browser/resources/downloads.html b/chrome/browser/resources/downloads.html
index acab6f0..6d85f3b 100644
--- a/chrome/browser/resources/downloads.html
+++ b/chrome/browser/resources/downloads.html
@@ -5,10 +5,8 @@
<title jscontent="title"></title>
<style type="text/css">
body {
- font-family:arial;
background-color:white;
color:black;
- font-size:84%;
margin:10px;
}
.header {
@@ -698,7 +696,7 @@ function downloadUpdated(results) {
}
</script>
</head>
-<body onload="load();">
+<body onload="load();" jsvalues=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<div class="header">
<a href="" onclick="setSearch(''); return false;">
<img src="../../app/theme/downloads_section.png"
@@ -734,4 +732,4 @@ function downloadUpdated(results) {
<span id="control_resume" jscontent="control_resume">Resume</span>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/chrome/browser/resources/history.html b/chrome/browser/resources/history.html
index bd9738e..4f7347b 100644
--- a/chrome/browser/resources/history.html
+++ b/chrome/browser/resources/history.html
@@ -807,10 +807,8 @@ function historyDeleted() {
</script>
<style type="text/css">
body {
- font-family:arial;
background-color:white;
color:black;
- font-size:84%;
margin:10px;
}
.header {
@@ -921,7 +919,7 @@ html[dir='rtl'] .entry .title a {
}
</style>
</head>
-<body onload="load();">
+<body onload="load();" jsvalues=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<div class="header">
<a href="" onclick="setSearch(''); return false;">
<img src="../../app/theme/history_section.png"
@@ -954,4 +952,4 @@ html[dir='rtl'] .entry .title a {
<span id="deletedaywarning" jscontent="deletedaywarning">Are you sure you want to delete this day?</span>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/chrome/browser/resources/incognito_tab.html b/chrome/browser/resources/incognito_tab.html
index 6d34646..c35f351 100644
--- a/chrome/browser/resources/incognito_tab.html
+++ b/chrome/browser/resources/incognito_tab.html
@@ -14,8 +14,6 @@ body {
background-color:#eee;
color:black;
padding:10px 10px 10px 10px;
- font-family:arial;
- font-size:84%;
max-width:600px;
margin-left:auto;
margin-right:auto;
@@ -23,7 +21,7 @@ body {
</style>
</head>
<body>
-<div class="content">
+<div class="content" jsvalues=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<img src="../../app/theme/otr_icon_standalone.png" class="icon" />
<span jseval="this.innerHTML = $this.content;"></span>
</div>
diff --git a/chrome/browser/resources/new_tab.html b/chrome/browser/resources/new_tab.html
index 1b966ca..e71dc51 100644
--- a/chrome/browser/resources/new_tab.html
+++ b/chrome/browser/resources/new_tab.html
@@ -184,9 +184,7 @@ logEvent('log start');
<title jscontent="title"></title>
<style type="text/css">
body {
- font-family:arial;
background-color:white;
- font-size:84%;
margin:0px;
}
html[firstview='true'] #main {
@@ -391,7 +389,8 @@ html[dir='rtl'] #searches input {
}
</style>
</head>
-<body onload="logEvent('body onload fired');">
+<body onload="logEvent('body onload fired');"
+ jsvalues=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<div id="l10n" style="display:none;">
<span id="closedwindow" jscontent="closedwindow">Window</span>
</div>