summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorskobes@chromium.org <skobes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 04:03:59 +0000
committerskobes@chromium.org <skobes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 04:03:59 +0000
commitb255a8e0e881d0b610743905fda9ac1b894c00cf (patch)
tree4d60f0c86d27c96274c98ca92a3b507a8828f421 /chrome/common
parent2f673064c29a9daa65b65a3c82ecfc2d0b52071b (diff)
downloadchromium_src-b255a8e0e881d0b610743905fda9ac1b894c00cf.zip
chromium_src-b255a8e0e881d0b610743905fda9ac1b894c00cf.tar.gz
chromium_src-b255a8e0e881d0b610743905fda9ac1b894c00cf.tar.bz2
Add font_scale_factor_quirk pref.
This is an Android-specific boolean pref defaulting to true, which indicates whether font_scale_factor includes the 1.05-1.3x multiplier that is currently applied by Clank on startup. The goal is to move this multiplier out of Clank and into the content layer. When font_scale_factor_quirk is false, the multiplier is applied in content::ApplyWebPreferences. This pref can be removed after Clank code is updated. BUG= Review URL: https://codereview.chromium.org/28053002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/pref_names.cc2
-rw-r--r--chrome/common/pref_names.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index d6dbb32..45a8f3d 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -256,6 +256,8 @@ const char kWebKitAllowRunningInsecureContent[] =
"webkit.webprefs.allow_running_insecure_content";
#if defined(OS_ANDROID)
const char kWebKitFontScaleFactor[] = "webkit.webprefs.font_scale_factor";
+const char kWebKitFontScaleFactorQuirk[] =
+ "webkit.webprefs.font_scale_factor_quirk";
const char kWebKitForceEnableZoom[] = "webkit.webprefs.force_enable_zoom";
const char kWebKitPasswordEchoEnabled[] =
"webkit.webprefs.password_echo_enabled";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 93911c7..2520f22 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -126,6 +126,7 @@ extern const char kWebKitAllowDisplayingInsecureContent[];
extern const char kWebKitAllowRunningInsecureContent[];
#if defined(OS_ANDROID)
extern const char kWebKitFontScaleFactor[];
+extern const char kWebKitFontScaleFactorQuirk[];
extern const char kWebKitForceEnableZoom[];
extern const char kWebKitPasswordEchoEnabled[];
#endif