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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the previous fix 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
Download patch
« chrome/browser/sync/glue/model_associator.h ('K') | « chrome/browser/translate/translate_prefs.cc ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 4d1777e99271ace15aef6e9ba0c8fc15b03fccc9..e4989ccaac1a233f93087aa67fa843535356b261 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2051,25 +2051,42 @@ void Browser::SetNewHomePagePrefs(PrefService* prefs) {
// static
void Browser::RegisterPrefs(PrefService* prefs) {
- prefs->RegisterIntegerPref(prefs::kOptionsWindowLastTabIndex, 0);
- prefs->RegisterIntegerPref(prefs::kExtensionSidebarWidth, -1);
- prefs->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
- prefs->RegisterBooleanPref(prefs::kAllowFileSelectionDialogs, true);
+ prefs->RegisterIntegerPref(prefs::kOptionsWindowLastTabIndex,
+ 0,
+ false /* don't sync pref */);
+ prefs->RegisterIntegerPref(prefs::kExtensionSidebarWidth,
+ -1,
+ false /* don't sync pref */);
+ prefs->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration,
+ 0,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kAllowFileSelectionDialogs,
+ true,
+ false /* don't sync pref */);
// Educated guess: Chrome has a bundled Flash version supporting
// clearing LSO data, Chromium hasn't.
#if defined(GOOGLE_CHROME_BUILD)
- prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, true);
+ prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled,
+ true,
+ false /* don't sync pref */);
#else
- prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, false);
+ prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled,
+ false,
+ false /* don't sync pref */);
#endif
}
// static
void Browser::RegisterUserPrefs(PrefService* prefs) {
prefs->RegisterStringPref(prefs::kHomePage,
- chrome::kChromeUINewTabURL);
- prefs->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, true);
- prefs->RegisterBooleanPref(prefs::kShowHomeButton, false);
+ chrome::kChromeUINewTabURL,
+ true /* sync pref */);
+ prefs->RegisterBooleanPref(prefs::kHomePageIsNewTabPage,
+ true,
+ true /* sync pref */);
+ prefs->RegisterBooleanPref(prefs::kShowHomeButton,
+ false,
+ true /* sync pref */);
#if defined(OS_MACOSX)
// This really belongs in platform code, but there's no good place to
// initialize it between the time when the AppController is created
@@ -2079,39 +2096,92 @@ void Browser::RegisterUserPrefs(PrefService* prefs) {
// pref to be already initialized. Doing it here also saves us from having
// to hard-code pref registration in the several unit tests that use
// this preference.
- prefs->RegisterBooleanPref(prefs::kConfirmToQuitEnabled, false);
- prefs->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true);
+ prefs->RegisterBooleanPref(prefs::kConfirmToQuitEnabled,
+ false,
+ true /* sync pref */);
+ prefs->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar,
+ true,
+ false /* don't sync pref */);
#endif
- prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true);
- prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true);
- prefs->RegisterBooleanPref(prefs::kDeleteCache, true);
- prefs->RegisterBooleanPref(prefs::kDeleteCookies, true);
- prefs->RegisterBooleanPref(prefs::kDeletePasswords, false);
- prefs->RegisterBooleanPref(prefs::kDeleteFormData, false);
- prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0);
- prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true);
- prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true);
- prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true);
- prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
- prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
- prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false);
- prefs->RegisterBooleanPref(prefs::kEnableTranslate, true);
- prefs->RegisterBooleanPref(prefs::kEnableBookmarkBar, true);
- prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false);
- prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
- prefs->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
- prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, false);
- prefs->RegisterBooleanPref(prefs::kIncognitoEnabled, true);
- prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, -1);
- prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
- prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement);
+ prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory,
+ true,
+ true /* sync pref */);
+ prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory,
+ true,
+ true /* sync pref */);
+ prefs->RegisterBooleanPref(prefs::kDeleteCache, true, true /* sync pref */);
+ prefs->RegisterBooleanPref(prefs::kDeleteCookies,
+ true,
+ true /* sync pref */);
+ prefs->RegisterBooleanPref(prefs::kDeletePasswords,
+ false,
+ true /* sync pref */);
+ prefs->RegisterBooleanPref(prefs::kDeleteFormData,
+ false,
+ true /* sync pref */);
+ prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod,
+ 0,
+ true /* sync pref */);
+ prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser,
+ true,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint,
+ true,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop,
+ true,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu,
+ true,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar,
+ true,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kUseVerticalTabs,
+ false,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kEnableTranslate,
+ true,
+ true /* sync pref */);
+ prefs->RegisterBooleanPref(prefs::kEnableBookmarkBar,
+ true,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted,
+ false,
+ false /* don't sync pref */);
+ prefs->RegisterStringPref(prefs::kCloudPrintEmail,
+ std::string(),
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled,
+ true,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kDevToolsDisabled,
+ false,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kIncognitoEnabled,
+ true,
+ false /* don't sync pref */);
+ prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation,
+ -1,
+ false /* don't sync pref */);
+ prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement,
+ false /* don't sync pref */);
+ prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement,
+ false /* don't sync pref */);
// We need to register the type of these preferences in order to query
- // them even though they're typically only controlled via policy or command
- // line switches.
- prefs->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
- prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated, false);
- prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true);
- prefs->RegisterBooleanPref(prefs::kEnableReferrers, true);
+ // them even though they're only typically controlled via policy.
+ prefs->RegisterBooleanPref(prefs::kDisable3DAPIs,
+ false,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kPluginsAllowOutdated,
+ false,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing,
+ true,
+ false /* don't sync pref */);
+ prefs->RegisterBooleanPref(prefs::kEnableReferrers,
+ true,
+ false /* don't sync pref */);
}
// static
@@ -4329,7 +4399,8 @@ void Browser::RegisterAppPrefs(const std::string& app_name, Profile* profile) {
std::string window_pref(prefs::kBrowserWindowPlacement);
window_pref.append("_");
window_pref.append(app_name);
- profile->GetPrefs()->RegisterDictionaryPref(window_pref.c_str());
+ profile->GetPrefs()->RegisterDictionaryPref(window_pref.c_str(),
+ false /* don't sync pref */);
}
void Browser::TabRestoreServiceChanged(TabRestoreService* service) {
« chrome/browser/sync/glue/model_associator.h ('K') | « chrome/browser/translate/translate_prefs.cc ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698