chrome/browser/ui/tab_contents/tab_contents_wrapper.cc - Issue 6905044: Refactor preference syncing.

Unified Diff: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Self review Created 9 years, 8 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

« chrome/browser/sync/profile_sync_service.cc ('K') | « chrome/browser/ui/search_engines/keyword_editor_controller.cc ('k') | chrome/browser/ui/views/browser_actions_container.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

index 5da386f78c8d61dcc8d2dc1b5771250de046db9f..3f7e01d57bbdeac9d4d88525429d2c872d9721ee 100644

--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

@@ -115,60 +115,97 @@ PropertyAccessor<TabContentsWrapper*>* TabContentsWrapper::property_accessor() {

}

void TabContentsWrapper::RegisterUserPrefs(PrefService* prefs) {

- prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true);

+ prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,

+ true,

+ true /* sync pref */);

WebPreferences pref_defaults;

prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled,

- pref_defaults.javascript_enabled);

+ pref_defaults.javascript_enabled,

+ false /* don't sync pref */);

prefs->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled,

- pref_defaults.web_security_enabled);

+ pref_defaults.web_security_enabled,

+ false /* don't sync pref */);

prefs->RegisterBooleanPref(

- prefs::kWebKitJavascriptCanOpenWindowsAutomatically, true);

+ prefs::kWebKitJavascriptCanOpenWindowsAutomatically,

+ true,

+ false /* don't sync pref */);

prefs->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically,

- pref_defaults.loads_images_automatically);

+ pref_defaults.loads_images_automatically,

+ false /* don't sync pref */);

prefs->RegisterBooleanPref(prefs::kWebKitPluginsEnabled,

- pref_defaults.plugins_enabled);

+ pref_defaults.plugins_enabled,

+ false /* don't sync pref */);

prefs->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled,

- pref_defaults.dom_paste_enabled);

+ pref_defaults.dom_paste_enabled,

+ false /* don't sync pref */);

prefs->RegisterBooleanPref(prefs::kWebKitShrinksStandaloneImagesToFit,

- pref_defaults.shrinks_standalone_images_to_fit);

- prefs->RegisterDictionaryPref(prefs::kWebKitInspectorSettings);

+ pref_defaults.shrinks_standalone_images_to_fit,

+ false /* don't sync pref */);

+ prefs->RegisterDictionaryPref(prefs::kWebKitInspectorSettings,

+ false /* don't sync pref */);

prefs->RegisterBooleanPref(prefs::kWebKitTextAreasAreResizable,

- pref_defaults.text_areas_are_resizable);

+ pref_defaults.text_areas_are_resizable,

+ false /* don't sync pref */);

prefs->RegisterBooleanPref(prefs::kWebKitJavaEnabled,

- pref_defaults.java_enabled);

+ pref_defaults.java_enabled,

+ false /* don't sync pref */);

prefs->RegisterBooleanPref(prefs::kWebkitTabsToLinks,

- pref_defaults.tabs_to_links);

+ pref_defaults.tabs_to_links,

+ false /* don't sync pref */);

+#if !defined(OS_MACOSX)

prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages,

- IDS_ACCEPT_LANGUAGES);

+ IDS_ACCEPT_LANGUAGES,

+ true /* sync pref */);

+#else

+ // Not used in OSX.

+ prefs->RegisterLocalizedStringPref(prefs::kAcceptLanguages,

+ IDS_ACCEPT_LANGUAGES,

+ false /* don't sync pref */);

+#endif

prefs->RegisterLocalizedStringPref(prefs::kDefaultCharset,

- IDS_DEFAULT_ENCODING);

+ IDS_DEFAULT_ENCODING,

+ true /* sync pref */);

prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamily,

- IDS_STANDARD_FONT_FAMILY);

+ IDS_STANDARD_FONT_FAMILY,

+ false /* don't sync pref */);

prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamily,

- IDS_FIXED_FONT_FAMILY);

+ IDS_FIXED_FONT_FAMILY,

+ false /* don't sync pref */);

prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamily,

- IDS_SERIF_FONT_FAMILY);

+ IDS_SERIF_FONT_FAMILY,

+ false /* don't sync pref */);

prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamily,

- IDS_SANS_SERIF_FONT_FAMILY);

+ IDS_SANS_SERIF_FONT_FAMILY,

+ false /* don't sync pref */);

prefs->RegisterLocalizedStringPref(prefs::kWebKitCursiveFontFamily,

- IDS_CURSIVE_FONT_FAMILY);

+ IDS_CURSIVE_FONT_FAMILY,

+ false /* don't sync pref */);

prefs->RegisterLocalizedStringPref(prefs::kWebKitFantasyFontFamily,

- IDS_FANTASY_FONT_FAMILY);

+ IDS_FANTASY_FONT_FAMILY,

+ false /* don't sync pref */);

prefs->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFontSize,

- IDS_DEFAULT_FONT_SIZE);

+ IDS_DEFAULT_FONT_SIZE,

+ false /* don't sync pref */);

prefs->RegisterLocalizedIntegerPref(prefs::kWebKitDefaultFixedFontSize,

- IDS_DEFAULT_FIXED_FONT_SIZE);

+ IDS_DEFAULT_FIXED_FONT_SIZE,

+ false /* don't sync pref */);

prefs->RegisterLocalizedIntegerPref(prefs::kWebKitMinimumFontSize,

- IDS_MINIMUM_FONT_SIZE);

+ IDS_MINIMUM_FONT_SIZE,

+ false /* don't sync pref */);

prefs->RegisterLocalizedIntegerPref(prefs::kWebKitMinimumLogicalFontSize,

- IDS_MINIMUM_LOGICAL_FONT_SIZE);

+ IDS_MINIMUM_LOGICAL_FONT_SIZE,

+ false /* don't sync pref */);

prefs->RegisterLocalizedBooleanPref(prefs::kWebKitUsesUniversalDetector,

- IDS_USES_UNIVERSAL_DETECTOR);

+ IDS_USES_UNIVERSAL_DETECTOR,

+ true /* sync pref */);

prefs->RegisterLocalizedStringPref(prefs::kStaticEncodings,

- IDS_STATIC_ENCODING_LIST);

- prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, "");

+ IDS_STATIC_ENCODING_LIST,

+ false /* don't sync pref */);

+ prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding,

+ "",

+ false /* don't sync pref */);

}

string16 TabContentsWrapper::GetDefaultTitle() {