summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 23:39:10 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-01 23:39:10 +0000
commit16480f67b506645b0630043a43e3f053bd7a64de (patch)
tree1970968224e608e3f88feecddff6fddedb88ef47 /content
parenta03712972e4aab08210846a2c8fcea159b9d766f (diff)
downloadchromium_src-16480f67b506645b0630043a43e3f053bd7a64de.zip
chromium_src-16480f67b506645b0630043a43e3f053bd7a64de.tar.gz
chromium_src-16480f67b506645b0630043a43e3f053bd7a64de.tar.bz2
web-ui settings: Standard font setting now correlates to WebKit's standard font family only.
BUG=74434 TEST=Verify that changing the 'standard font' only applies to unspecified font styles. Review URL: http://codereview.chromium.org/6602021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/tab_contents/tab_contents.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 6f93e14..4069494 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -169,6 +169,7 @@ const char* kPrefsToObserve[] = {
prefs::kWebKitLoadsImagesAutomatically,
prefs::kWebKitPluginsEnabled,
prefs::kWebKitUsesUniversalDetector,
+ prefs::kWebKitStandardFontFamily,
prefs::kWebKitSerifFontFamily,
prefs::kWebKitSansSerifFontFamily,
prefs::kWebKitFixedFontFamily,
@@ -178,10 +179,6 @@ const char* kPrefsToObserve[] = {
prefs::kWebKitMinimumLogicalFontSize,
prefs::kWebkitTabsToLinks,
prefs::kDefaultCharset
- // kWebKitStandardFontIsSerif needs to be added
- // if we let users pick which font to use, serif or sans-serif when
- // no font is specified or a CSS generic family (serif or sans-serif)
- // is not specified.
};
const int kPrefsToObserveLength = arraysize(kPrefsToObserve);