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 78dd3672193808795f5c9d489dbb675a3a8ed414..9dde066d79edac8e5541f47cbaca1a80f9471470 100644 |
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc |
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc |
@@ -40,59 +40,59 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(PrefsTabHelper) |
namespace { |
// Registers prefs only used for migration. |
-void RegisterPrefsToMigrate(PrefService* prefs) { |
+void RegisterPrefsToMigrate(PrefServiceSyncable* prefs) { |
prefs->RegisterLocalizedStringPref(prefs::kWebKitOldStandardFontFamily, |
IDS_STANDARD_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kWebKitOldFixedFontFamily, |
IDS_FIXED_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kWebKitOldSerifFontFamily, |
IDS_SERIF_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kWebKitOldSansSerifFontFamily, |
IDS_SANS_SERIF_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kWebKitOldCursiveFontFamily, |
IDS_CURSIVE_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kWebKitOldFantasyFontFamily, |
IDS_FANTASY_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kGlobalDefaultCharset, |
IDS_DEFAULT_ENCODING, |
- PrefService::SYNCABLE_PREF); |
+ PrefServiceSyncable::SYNCABLE_PREF); |
prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalDefaultFontSize, |
IDS_DEFAULT_FONT_SIZE, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalDefaultFixedFontSize, |
IDS_DEFAULT_FIXED_FONT_SIZE, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedIntegerPref(prefs::kWebKitGlobalMinimumFontSize, |
IDS_MINIMUM_FONT_SIZE, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedIntegerPref( |
prefs::kWebKitGlobalMinimumLogicalFontSize, |
IDS_MINIMUM_LOGICAL_FONT_SIZE, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalStandardFontFamily, |
IDS_STANDARD_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFixedFontFamily, |
IDS_FIXED_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSerifFontFamily, |
IDS_SERIF_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalSansSerifFontFamily, |
IDS_SANS_SERIF_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalCursiveFontFamily, |
IDS_CURSIVE_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kWebKitGlobalFantasyFontFamily, |
IDS_FANTASY_FONT_FAMILY, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
} |
// The list of prefs we want to observe. |
@@ -121,7 +121,7 @@ const int kPrefsToObserveLength = arraysize(kPrefsToObserve); |
// Registers a preference under the path |map_name| for each script used for |
// per-script font prefs. For example, if |map_name| is "fonts.serif", then |
// "fonts.serif.Arab", "fonts.serif.Hang", etc. are registered. |
-void RegisterFontFamilyMap(PrefService* prefs, |
+void RegisterFontFamilyMap(PrefServiceSyncable* prefs, |
const char* map_name, |
const std::set<std::string>& fonts_with_defaults) { |
for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) { |
@@ -131,7 +131,8 @@ void RegisterFontFamilyMap(PrefService* prefs, |
if (fonts_with_defaults.find(pref_name) == fonts_with_defaults.end()) { |
// We haven't already set a default value for this font preference, so set |
// an empty string as the default. |
- prefs->RegisterStringPref(pref_name, "", PrefService::UNSYNCABLE_PREF); |
+ prefs->RegisterStringPref( |
+ pref_name, "", PrefServiceSyncable::UNSYNCABLE_PREF); |
} |
} |
} |
@@ -338,7 +339,7 @@ const struct { |
const int kPrefsToMigrateLength = ARRAYSIZE_UNSAFE(kPrefNamesToMigrate); |
-void MigratePreferences(PrefService* prefs) { |
+void MigratePreferences(PrefServiceSyncable* prefs) { |
RegisterPrefsToMigrate(prefs); |
for (int i = 0; i < kPrefsToMigrateLength; ++i) { |
const PrefService::Preference* pref = |
@@ -450,72 +451,72 @@ void PrefsTabHelper::InitIncognitoUserPrefStore( |
} |
// static |
-void PrefsTabHelper::RegisterUserPrefs(PrefService* prefs) { |
+void PrefsTabHelper::RegisterUserPrefs(PrefServiceSyncable* prefs) { |
WebPreferences pref_defaults; |
prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled, |
pref_defaults.javascript_enabled, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled, |
pref_defaults.web_security_enabled, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref( |
prefs::kWebKitJavascriptCanOpenWindowsAutomatically, |
true, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically, |
pref_defaults.loads_images_automatically, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kWebKitPluginsEnabled, |
pref_defaults.plugins_enabled, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled, |
pref_defaults.dom_paste_enabled, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kWebKitShrinksStandaloneImagesToFit, |
pref_defaults.shrinks_standalone_images_to_fit, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterDictionaryPref(prefs::kWebKitInspectorSettings, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable, |
pref_defaults.text_areas_are_resizable, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kWebKitJavaEnabled, |
pref_defaults.java_enabled, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kWebkitTabsToLinks, |
pref_defaults.tabs_to_links, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kWebKitAllowRunningInsecureContent, |
false, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kWebKitAllowDisplayingInsecureContent, |
true, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kEnableReferrers, |
true, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
#if defined(OS_ANDROID) |
prefs->RegisterDoublePref(prefs::kWebKitFontScaleFactor, |
pref_defaults.font_scale_factor, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterBooleanPref(prefs::kWebKitForceEnableZoom, |
pref_defaults.force_enable_zoom, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
#endif |
#if !defined(OS_MACOSX) |
prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages, |
IDS_ACCEPT_LANGUAGES, |
- PrefService::SYNCABLE_PREF); |
+ PrefServiceSyncable::SYNCABLE_PREF); |
#else |
// Not used in OSX. |
prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages, |
IDS_ACCEPT_LANGUAGES, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
#endif |
prefs->RegisterLocalizedStringPref(prefs::kDefaultCharset, |
IDS_DEFAULT_ENCODING, |
- PrefService::SYNCABLE_PREF); |
+ PrefServiceSyncable::SYNCABLE_PREF); |
// Register font prefs that have defaults. |
std::set<std::string> fonts_with_defaults; |
@@ -539,7 +540,7 @@ void PrefsTabHelper::RegisterUserPrefs(PrefService* prefs) { |
if (browser_script != pref_script) { |
prefs->RegisterLocalizedStringPref(pref.pref_name, |
pref.resource_id, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
fonts_with_defaults.insert(pref.pref_name); |
} |
} |
@@ -562,26 +563,26 @@ void PrefsTabHelper::RegisterUserPrefs(PrefService* prefs) { |
prefs->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFontSize, |
IDS_DEFAULT_FONT_SIZE, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFixedFontSize, |
IDS_DEFAULT_FIXED_FONT_SIZE, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedIntegerPref(prefs::kWebKitMinimumFontSize, |
IDS_MINIMUM_FONT_SIZE, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedIntegerPref( |
prefs::kWebKitMinimumLogicalFontSize, |
IDS_MINIMUM_LOGICAL_FONT_SIZE, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterLocalizedBooleanPref(prefs::kWebKitUsesUniversalDetector, |
IDS_USES_UNIVERSAL_DETECTOR, |
- PrefService::SYNCABLE_PREF); |
+ PrefServiceSyncable::SYNCABLE_PREF); |
prefs->RegisterLocalizedStringPref(prefs::kStaticEncodings, |
IDS_STATIC_ENCODING_LIST, |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, |
"", |
- PrefService::UNSYNCABLE_PREF); |
+ PrefServiceSyncable::UNSYNCABLE_PREF); |
MigratePreferences(prefs); |
} |