Refactor preference syncing.

chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/automation/automation_tab_helper.h"
@@ skipping 77 matching lines @@
 TabContentsWrapper::~TabContentsWrapper() {
   // We don't want any notifications while we're running our destructor.
   registrar_.RemoveAll();
 }
 
 PropertyAccessor<TabContentsWrapper*>* TabContentsWrapper::property_accessor() {
   return g_tab_contents_wrapper_property_accessor.Pointer();
 }
 
 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() {
   return l10n_util::GetStringUTF16(IDS_DEFAULT_TAB_TITLE);
 }
 
 string16 TabContentsWrapper::GetStatusText() const {
   if (!tab_contents()->is_loading() ||
       tab_contents()->load_state() == net::LOAD_STATE_IDLE) {
     return string16();
@@ skipping 159 matching lines @@
 }
 
 void TabContentsWrapper::UpdateStarredStateForCurrentURL() {
   BookmarkModel* model = tab_contents()->profile()->GetBookmarkModel();
   const bool old_state = is_starred_;
   is_starred_ = (model && model->IsBookmarked(tab_contents()->GetURL()));
 
   if (is_starred_ != old_state && delegate())
     delegate()->URLStarredChanged(this, is_starred_);
 }