summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 08:35:28 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 08:35:28 +0000
commit7ac1ce2f4d2e385c53340f501764bdd59bd86ad4 (patch)
tree8ee587f989b49da41a065df9d40dc3434f9acdcb /chrome/browser/tab_contents
parent95a45b981576dd24e0cabc77cc6244367c989d4f (diff)
downloadchromium_src-7ac1ce2f4d2e385c53340f501764bdd59bd86ad4.zip
chromium_src-7ac1ce2f4d2e385c53340f501764bdd59bd86ad4.tar.gz
chromium_src-7ac1ce2f4d2e385c53340f501764bdd59bd86ad4.tar.bz2
Add platform_locale_settings file for CrOS. This is necessary because
fonts available on CrOS are different from fonts on typical Linux disributions. BUG=cros:3815 (http://crosbug.com/3815) TEST=Go to a web page that only specifies CSS generic families (e.g. sans-serif,serif, monospace) and make sure that Ascender Sans, Ascender Serif are used. Review URL: http://codereview.chromium.org/2702001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/web_contents_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index 75d75ea..328cbc2 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -762,6 +762,8 @@ TEST_F(TabContentsTest, WebKitPrefs) {
// These should still be the default values.
#if defined(OS_MACOSX)
const wchar_t kDefaultFont[] = L"Times";
+#elif defined(OS_CHROMEOS)
+ const wchar_t kDefaultFont[] = L"Ascender Serif";
#else
const wchar_t kDefaultFont[] = L"Times New Roman";
#endif