diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 21:28:33 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-17 21:28:33 +0000 |
| commit | 071fc25c911a0fc0af149576d35a3fbb1f7cb86f (patch) | |
| tree | 09be5474bddfb97441892a48ee2ce02b4d276014 | |
| parent | 6362c17f9850bddbf69ff1113140f75d92378cbe (diff) | |
| download | chromium_src-071fc25c911a0fc0af149576d35a3fbb1f7cb86f.zip chromium_src-071fc25c911a0fc0af149576d35a3fbb1f7cb86f.tar.gz chromium_src-071fc25c911a0fc0af149576d35a3fbb1f7cb86f.tar.bz2 | |
Fix font on offline load page.
For some reason, the offline load page is not picking up the default system font but instead defaulting to Times New Roman. This CL fixes it by explicitly setting the font style for the page body.
R=dbeam@chromium.org
BUG=223934
TEST=Go offline and verify that the font used is the ChromeOS system font.
Review URL: https://codereview.chromium.org/14311003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194685 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/offline/offline_load_page.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/resources/chromeos/offline_load.html | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index a165ede..7bf3814 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -99,11 +99,9 @@ std::string OfflineLoadPage::GetHTMLContents() { // Activation strings.SetBoolean("show_activation", ShowActivationMessage()); - bool rtl = base::i18n::IsRTL(); - strings.SetString("textdirection", rtl ? "rtl" : "ltr"); - + webui::SetFontAndTextDirection(&strings); string16 failed_url(ASCIIToUTF16(url_.spec())); - if (rtl) + if (base::i18n::IsRTL()) base::i18n::WrapStringWithLTRFormatting(&failed_url); strings.SetString("url", failed_url); diff --git a/chrome/browser/resources/chromeos/offline_load.html b/chrome/browser/resources/chromeos/offline_load.html index 02d3b52..1af9baa 100644 --- a/chrome/browser/resources/chromeos/offline_load.html +++ b/chrome/browser/resources/chromeos/offline_load.html @@ -125,7 +125,8 @@ document.addEventListener('DOMContentLoaded', function() { }); </script> -<body oncontextmenu="return false;"> +<body oncontextmenu="return false;" + i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> <div id="mainview"> <div id="left"> <div class="upper"> |