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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10107014: Migrate WebKit "global script" font prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 8 years, 7 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/resources/options2/font_settings.html ('k') | chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc » ('j') | chrome/browser/ui/prefs/prefs_tab_helper_browsertest2.cc » ('J')
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 7c7d6a0c5900e5128735d6f355a61c0c6006551d..43889760ad489c94b154ab011777810f15fed1a1 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -35,24 +35,6 @@ static void RegisterFontsAndCharsetPrefs(PrefService* prefs) {
prefs->RegisterLocalizedStringPref(prefs::kDefaultCharset,
IDS_DEFAULT_ENCODING,
PrefService::SYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamily,
- IDS_STANDARD_FONT_FAMILY,
- PrefService::UNSYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamily,
- IDS_FIXED_FONT_FAMILY,
- PrefService::UNSYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamily,
- IDS_SERIF_FONT_FAMILY,
- PrefService::UNSYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamily,
- IDS_SANS_SERIF_FONT_FAMILY,
- PrefService::UNSYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitCursiveFontFamily,
- IDS_CURSIVE_FONT_FAMILY,
- PrefService::UNSYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitFantasyFontFamily,
- IDS_FANTASY_FONT_FAMILY,
- PrefService::UNSYNCABLE_PREF);
prefs->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFontSize,
IDS_DEFAULT_FONT_SIZE,
PrefService::UNSYNCABLE_PREF);
@@ -65,6 +47,44 @@ static void RegisterFontsAndCharsetPrefs(PrefService* prefs) {
prefs->RegisterLocalizedIntegerPref(prefs::kWebKitMinimumLogicalFontSize,
IDS_MINIMUM_LOGICAL_FONT_SIZE,
PrefService::UNSYNCABLE_PREF);
+
+ // These are only registered to be used in migration.
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitOldStandardFontFamily,
+ IDS_STANDARD_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitOldFixedFontFamily,
+ IDS_FIXED_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitOldSerifFontFamily,
+ IDS_SERIF_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitOldSansSerifFontFamily,
+ IDS_SANS_SERIF_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitOldCursiveFontFamily,
+ IDS_CURSIVE_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitOldFantasyFontFamily,
+ IDS_FANTASY_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalStandardFontFamily,
+ IDS_STANDARD_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFixedFontFamily,
+ IDS_FIXED_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSerifFontFamily,
+ IDS_SERIF_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSansSerifFontFamily,
+ IDS_SANS_SERIF_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalCursiveFontFamily,
+ IDS_CURSIVE_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFantasyFontFamily,
+ IDS_FANTASY_FONT_FAMILY,
+ PrefService::UNSYNCABLE_PREF);
}
// The list of prefs we want to observe.
@@ -74,20 +94,14 @@ const char* kPrefsToObserve[] = {
prefs::kEnableReferrers,
prefs::kWebKitAllowDisplayingInsecureContent,
prefs::kWebKitAllowRunningInsecureContent,
- prefs::kWebKitGlobalCursiveFontFamily,
prefs::kWebKitGlobalDefaultFixedFontSize,
prefs::kWebKitGlobalDefaultFontSize,
- prefs::kWebKitGlobalFantasyFontFamily,
- prefs::kWebKitGlobalFixedFontFamily,
prefs::kWebKitGlobalJavascriptEnabled,
prefs::kWebKitJavaEnabled,
prefs::kWebKitGlobalLoadsImagesAutomatically,
prefs::kWebKitGlobalMinimumFontSize,
prefs::kWebKitGlobalMinimumLogicalFontSize,
prefs::kWebKitGlobalPluginsEnabled,
- prefs::kWebKitGlobalSansSerifFontFamily,
- prefs::kWebKitGlobalSerifFontFamily,
- prefs::kWebKitGlobalStandardFontFamily,
prefs::kWebkitTabsToLinks,
prefs::kWebKitUsesUniversalDetector
};
@@ -242,26 +256,46 @@ const struct {
} kPrefNamesToMigrate[] = {
{ prefs::kDefaultCharset,
prefs::kGlobalDefaultCharset },
- { prefs::kWebKitCursiveFontFamily,
- prefs::kWebKitGlobalCursiveFontFamily },
{ prefs::kWebKitDefaultFixedFontSize,
prefs::kWebKitGlobalDefaultFixedFontSize },
{ prefs::kWebKitDefaultFontSize,
prefs::kWebKitGlobalDefaultFontSize },
- { prefs::kWebKitFantasyFontFamily,
- prefs::kWebKitGlobalFantasyFontFamily },
- { prefs::kWebKitFixedFontFamily,
- prefs::kWebKitGlobalFixedFontFamily },
{ prefs::kWebKitMinimumFontSize,
prefs::kWebKitGlobalMinimumFontSize },
{ prefs::kWebKitMinimumLogicalFontSize,
prefs::kWebKitGlobalMinimumLogicalFontSize },
- { prefs::kWebKitSansSerifFontFamily,
- prefs::kWebKitGlobalSansSerifFontFamily },
- { prefs::kWebKitSerifFontFamily,
- prefs::kWebKitGlobalSerifFontFamily },
- { prefs::kWebKitStandardFontFamily,
- prefs::kWebKitGlobalStandardFontFamily },
+
+ // Migrate old-style "standard_font_family" font prefs to
+ // "fonts.standard.Zyyy". These prefs will exist if the migration to global
+ // prefs (for the per-tab pref mechanism, which has since been removed)
+ // never occurred.
+ { prefs::kWebKitOldCursiveFontFamily,
+ prefs::kWebKitCursiveFontFamily },
+ { prefs::kWebKitOldFantasyFontFamily,
+ prefs::kWebKitFantasyFontFamily },
+ { prefs::kWebKitOldFixedFontFamily,
+ prefs::kWebKitFixedFontFamily },
+ { prefs::kWebKitOldSansSerifFontFamily,
+ prefs::kWebKitSansSerifFontFamily },
+ { prefs::kWebKitOldSerifFontFamily,
+ prefs::kWebKitSerifFontFamily },
+ { prefs::kWebKitOldStandardFontFamily,
+ prefs::kWebKitStandardFontFamily },
+
+ // Migrate "global" prefs. These will exist if the migration to global prefs
+ // (for the per-tab pref mechanism, which has since been removed) occurred.
+ { prefs::kWebKitGlobalCursiveFontFamily,
+ prefs::kWebKitCursiveFontFamily },
+ { prefs::kWebKitGlobalFantasyFontFamily,
+ prefs::kWebKitFantasyFontFamily },
+ { prefs::kWebKitGlobalFixedFontFamily,
+ prefs::kWebKitFixedFontFamily },
+ { prefs::kWebKitGlobalSansSerifFontFamily,
+ prefs::kWebKitSansSerifFontFamily },
+ { prefs::kWebKitGlobalSerifFontFamily,
+ prefs::kWebKitSerifFontFamily },
+ { prefs::kWebKitGlobalStandardFontFamily,
+ prefs::kWebKitStandardFontFamily }
};
const int kPrefsToMigrateLength = ARRAYSIZE_UNSAFE(kPrefNamesToMigrate);
@@ -384,22 +418,22 @@ void PrefsTabHelper::RegisterUserPrefs(PrefService* prefs) {
prefs->RegisterLocalizedStringPref(prefs::kGlobalDefaultCharset,
IDS_DEFAULT_ENCODING,
PrefService::SYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalStandardFontFamily,
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamily,
IDS_STANDARD_FONT_FAMILY,
PrefService::UNSYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFixedFontFamily,
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamily,
IDS_FIXED_FONT_FAMILY,
PrefService::UNSYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSerifFontFamily,
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamily,
IDS_SERIF_FONT_FAMILY,
PrefService::UNSYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSansSerifFontFamily,
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamily,
IDS_SANS_SERIF_FONT_FAMILY,
PrefService::UNSYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalCursiveFontFamily,
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitCursiveFontFamily,
IDS_CURSIVE_FONT_FAMILY,
PrefService::UNSYNCABLE_PREF);
- prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFantasyFontFamily,
+ prefs->RegisterLocalizedStringPref(prefs::kWebKitFantasyFontFamily,
IDS_FANTASY_FONT_FAMILY,
PrefService::UNSYNCABLE_PREF);
@@ -412,8 +446,7 @@ void PrefsTabHelper::RegisterUserPrefs(PrefService* prefs) {
const PerScriptFontDefault& pref = kPerScriptFontDefaults[i];
// Suppress default per-script font when the script matches the browser's
// locale. Otherwise, the default would override the user's preferences
- // when viewing pages in their native language. This can be removed when
- // per-script fonts are added to Preferences UI.
+ // when viewing pages in their native language.
if (!StartsWithASCII(locale, pref.native_locale, false)) {
prefs->RegisterLocalizedStringPref(pref.pref_name,
pref.resource_id,
« no previous file with comments | « chrome/browser/resources/options2/font_settings.html ('k') | chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc » ('j') | chrome/browser/ui/prefs/prefs_tab_helper_browsertest2.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698