Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3385)

Unified Diff: chrome/browser/ui/prefs/prefs_tab_helper.cc

Issue 2734573002: Don't look up font size preferences on Android. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prefs/chrome_pref_service_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/prefs/prefs_tab_helper.cc
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
index e20d4e5c5d6148387ea4326325c79bdc0c9d3714..d778d56efffe14d86130e25ff0537762d3dd284c 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -321,6 +321,7 @@ void OverrideFontFamily(WebPreferences* prefs,
(*map)[script] = base::UTF8ToUTF16(pref_value);
}
+#if !defined(OS_ANDROID)
void RegisterLocalizedFontPref(user_prefs::PrefRegistrySyncable* registry,
const char* path,
int default_message_id) {
@@ -330,6 +331,7 @@ void RegisterLocalizedFontPref(user_prefs::PrefRegistrySyncable* registry,
DCHECK(success);
registry->RegisterIntegerPref(path, val);
}
+#endif
} // namespace
@@ -580,10 +582,9 @@ void PrefsTabHelper::RegisterProfilePrefs(
}
}
- // Register per-script font prefs that don't have defaults.
+// Register font prefs. This is only configurable on desktop Chrome.
#if !defined(OS_ANDROID)
RegisterFontFamilyPrefs(registry, fonts_with_defaults);
-#endif
RegisterLocalizedFontPref(registry, prefs::kWebKitDefaultFontSize,
IDS_DEFAULT_FONT_SIZE);
@@ -593,6 +594,7 @@ void PrefsTabHelper::RegisterProfilePrefs(
IDS_MINIMUM_FONT_SIZE);
RegisterLocalizedFontPref(registry, prefs::kWebKitMinimumLogicalFontSize,
IDS_MINIMUM_LOGICAL_FONT_SIZE);
+#endif
}
// static
« no previous file with comments | « chrome/browser/prefs/chrome_pref_service_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698