From cc36c2c22e74ed768cfdf716a2486cdfd5e933d7 Mon Sep 17 00:00:00 2001 From: "dfalcantara@chromium.org" Date: Thu, 1 Mar 2012 00:57:34 +0000 Subject: [PATCH] Alphabetize preferences in browser_prefs.cc Follow up CL for https://chromiumcodereview.appspot.com/9455031/ http://crbug.com/113487 Review URL: http://codereview.chromium.org/9467026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124317 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/prefs/browser_prefs.cc | 116 ++++++++++++++------------ 1 file changed, 63 insertions(+), 53 deletions(-) diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 2e52bd49e4ab84..66d63440339e6b 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -104,52 +104,55 @@ namespace browser { void RegisterLocalState(PrefService* local_state) { // Prefs in Local State local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0); + AppsPromo::RegisterPrefs(local_state); Browser::RegisterPrefs(local_state); - FlagsUI::RegisterPrefs(local_state); - WebCacheManager::RegisterPrefs(local_state); + browser_shutdown::RegisterPrefs(local_state); ExternalProtocolHandler::RegisterPrefs(local_state); + FlagsUI::RegisterPrefs(local_state); + geolocation::RegisterPrefs(local_state); GoogleURLTracker::RegisterPrefs(local_state); IntranetRedirectDetector::RegisterPrefs(local_state); KeywordEditorController::RegisterPrefs(local_state); MetricsLog::RegisterPrefs(local_state); MetricsService::RegisterPrefs(local_state); + NotificationUIManager::RegisterPrefs(local_state); + PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); + ProfileInfoCache::RegisterPrefs(local_state); + ProfileManager::RegisterPrefs(local_state); + SSLConfigServiceManager::RegisterPrefs(local_state); + TaskManager::RegisterPrefs(local_state); + UpgradeDetector::RegisterPrefs(local_state); + WebCacheManager::RegisterPrefs(local_state); + +#if defined(ENABLE_CONFIGURATION_POLICY) + policy::CloudPolicySubsystem::RegisterPrefs(local_state); +#endif #if defined(ENABLE_SAFE_BROWSING) SafeBrowsingService::RegisterPrefs(local_state); #endif - browser_shutdown::RegisterPrefs(local_state); + #if defined(TOOLKIT_VIEWS) BrowserView::RegisterBrowserViewPrefs(local_state); #endif - UpgradeDetector::RegisterPrefs(local_state); - TaskManager::RegisterPrefs(local_state); - geolocation::RegisterPrefs(local_state); - NotificationUIManager::RegisterPrefs(local_state); - PrefProxyConfigTrackerImpl::RegisterPrefs(local_state); - SSLConfigServiceManager::RegisterPrefs(local_state); -#if defined(ENABLE_CONFIGURATION_POLICY) - policy::CloudPolicySubsystem::RegisterPrefs(local_state); -#endif - ProfileInfoCache::RegisterPrefs(local_state); - ProfileManager::RegisterPrefs(local_state); #if !defined(OS_ANDROID) + BackgroundModeManager::RegisterPrefs(local_state); NewTabPageHandler::RegisterPrefs(local_state); printing::PrintJobManager::RegisterPrefs(local_state); PromoResourceService::RegisterPrefs(local_state); - BackgroundModeManager::RegisterPrefs(local_state); #endif #if defined(OS_CHROMEOS) chromeos::AudioHandler::RegisterPrefs(local_state); - chromeos::UserManager::RegisterPrefs(local_state); - chromeos::WizardController::RegisterPrefs(local_state); chromeos::InputMethodMenu::RegisterPrefs(local_state); - chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); - chromeos::signed_settings_cache::RegisterPrefs(local_state); chromeos::NetworkMenuButton::RegisterPrefs(local_state); chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); + chromeos::UserManager::RegisterPrefs(local_state); + chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); + chromeos::signed_settings_cache::RegisterPrefs(local_state); + chromeos::WizardController::RegisterPrefs(local_state); policy::AutoEnrollmentClient::RegisterPrefs(local_state); policy::DeviceStatusCollector::RegisterPrefs(local_state); #endif @@ -161,64 +164,71 @@ void RegisterLocalState(PrefService* local_state) { void RegisterUserPrefs(PrefService* user_prefs) { // User prefs + AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); AppsPromo::RegisterUserPrefs(user_prefs); AutofillManager::RegisterUserPrefs(user_prefs); - SessionStartupPref::RegisterUserPrefs(user_prefs); + bookmark_utils::RegisterUserPrefs(user_prefs); BookmarkModel::RegisterUserPrefs(user_prefs); Browser::RegisterUserPrefs(user_prefs); BrowserInit::RegisterUserPrefs(user_prefs); - PasswordManager::RegisterUserPrefs(user_prefs); + chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); + DevToolsWindow::RegisterUserPrefs(user_prefs); DownloadPrefs::RegisterUserPrefs(user_prefs); - bookmark_utils::RegisterUserPrefs(user_prefs); - AlternateErrorPageTabObserver::RegisterUserPrefs(user_prefs); - PrefsTabHelper::RegisterUserPrefs(user_prefs); - TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); - ExtensionWebUI::RegisterUserPrefs(user_prefs); + extensions::ComponentLoader::RegisterUserPrefs(user_prefs); + ExtensionPrefs::RegisterUserPrefs(user_prefs); ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); + ExtensionWebUI::RegisterUserPrefs(user_prefs); + GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); + HostContentSettingsMap::RegisterUserPrefs(user_prefs); IncognitoModePrefs::RegisterUserPrefs(user_prefs); + InstantController::RegisterUserPrefs(user_prefs); + NetPrefObserver::RegisterPrefs(user_prefs); NewTabUI::RegisterUserPrefs(user_prefs); - ProfileImpl::RegisterUserPrefs(user_prefs); - HostContentSettingsMap::RegisterUserPrefs(user_prefs); - DevToolsWindow::RegisterUserPrefs(user_prefs); + PasswordManager::RegisterUserPrefs(user_prefs); PinnedTabCodec::RegisterUserPrefs(user_prefs); - ExtensionPrefs::RegisterUserPrefs(user_prefs); - TranslatePrefs::RegisterUserPrefs(user_prefs); PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); -#if defined(TOOLKIT_VIEWS) - BrowserActionsContainer::RegisterUserPrefs(user_prefs); -#elif defined(TOOLKIT_GTK) - BrowserWindowGtk::RegisterUserPrefs(user_prefs); -#endif -#if defined(OS_CHROMEOS) - chromeos::Preferences::RegisterUserPrefs(user_prefs); - chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs); -#endif - InstantController::RegisterUserPrefs(user_prefs); - NetPrefObserver::RegisterPrefs(user_prefs); + PrefsTabHelper::RegisterUserPrefs(user_prefs); + ProfileImpl::RegisterUserPrefs(user_prefs); ProtocolHandlerRegistry::RegisterPrefs(user_prefs); -#if defined(OS_MACOSX) - PresentationModePrefs::RegisterUserPrefs(user_prefs); - confirm_quit::RegisterObsoleteUserPrefs(user_prefs); -#endif + SessionStartupPref::RegisterUserPrefs(user_prefs); + SyncPromoUI::RegisterUserPrefs(user_prefs); + TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); + TranslatePrefs::RegisterUserPrefs(user_prefs); + web_intents::RegisterUserPrefs(user_prefs); + #if defined(ENABLE_CONFIGURATION_POLICY) policy::URLBlacklistManager::RegisterPrefs(user_prefs); #endif - SyncPromoUI::RegisterUserPrefs(user_prefs); - GAIAInfoUpdateService::RegisterUserPrefs(user_prefs); - chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); -#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) - default_apps::RegisterUserPrefs(user_prefs); + +#if defined(TOOLKIT_VIEWS) + BrowserActionsContainer::RegisterUserPrefs(user_prefs); +#elif defined(TOOLKIT_GTK) + BrowserWindowGtk::RegisterUserPrefs(user_prefs); #endif - extensions::ComponentLoader::RegisterUserPrefs(user_prefs); - web_intents::RegisterUserPrefs(user_prefs); + #if defined(USE_AURA) ChromeLauncherDelegate::RegisterUserPrefs(user_prefs); #endif + #if !defined(OS_ANDROID) PluginsUI::RegisterUserPrefs(user_prefs); PromoResourceService::RegisterUserPrefs(user_prefs); #endif + +#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + default_apps::RegisterUserPrefs(user_prefs); +#endif + +#if defined(OS_CHROMEOS) + chromeos::Preferences::RegisterUserPrefs(user_prefs); + chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs); +#endif + +#if defined(OS_MACOSX) + confirm_quit::RegisterObsoleteUserPrefs(user_prefs); + PresentationModePrefs::RegisterUserPrefs(user_prefs); +#endif } void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) {