diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-10 22:28:17 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-10 22:28:17 +0000 |
| commit | a42f2e2d7447f9ae1a65f7171c29b75bd3d14826 (patch) | |
| tree | 91ccbbce3bbe159175855c4352cba71b884ec16a /chrome/browser/prefs | |
| parent | 00475c046ebe17b9df0cf55d14afbebcb7f67437 (diff) | |
| download | chromium_src-a42f2e2d7447f9ae1a65f7171c29b75bd3d14826.zip chromium_src-a42f2e2d7447f9ae1a65f7171c29b75bd3d14826.tar.gz chromium_src-a42f2e2d7447f9ae1a65f7171c29b75bd3d14826.tar.bz2 | |
profile: Add a way for each ProfileKeyedServiceFactory to specify its user prefernces.
To allow us to compile individual features in/out of a chrome build, we need to
attack browser_prefs.cc, which is a giant static registration. This used to be
done through another big code path starting in ProfileImpl which call
browser::RegisterUserPrefs() which linked to other static methods. Now this is
done through overridding ProfileKeyedServiceFactory::RegisterUserPrefs(), and
there are no additional dependencies.
BUG=none
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=104412
Review URL: http://codereview.chromium.org/7901027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 1222f95..e922e50 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -6,7 +6,6 @@ #include "chrome/browser/about_flags.h" #include "chrome/browser/autofill/autofill_manager.h" -#include "chrome/browser/background/background_contents_service.h" #include "chrome/browser/background/background_mode_manager.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -34,7 +33,6 @@ #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/page_info_model.h" #include "chrome/browser/password_manager/password_manager.h" -#include "chrome/browser/plugin_prefs.h" #include "chrome/browser/policy/cloud_policy_subsystem.h" #include "chrome/browser/policy/url_blacklist_manager.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" @@ -46,7 +44,6 @@ #include "chrome/browser/remoting/firewall_traversal_observer.h" #include "chrome/browser/renderer_host/web_cache_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/sync/signin_manager.h" #include "chrome/browser/tabs/pinned_tab_codec.h" @@ -156,7 +153,6 @@ void RegisterUserPrefs(PrefService* user_prefs) { ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); IncognitoModePrefs::RegisterUserPrefs(user_prefs); NewTabUI::RegisterUserPrefs(user_prefs); - PluginPrefs::RegisterPrefs(user_prefs); PluginsUI::RegisterUserPrefs(user_prefs); ProfileImpl::RegisterUserPrefs(user_prefs); PromoResourceService::RegisterUserPrefs(user_prefs); @@ -174,9 +170,7 @@ void RegisterUserPrefs(PrefService* user_prefs) { #if defined(OS_CHROMEOS) chromeos::Preferences::RegisterUserPrefs(user_prefs); #endif - BackgroundContentsService::RegisterUserPrefs(user_prefs); SigninManager::RegisterUserPrefs(user_prefs); - TemplateURLService::RegisterUserPrefs(user_prefs); InstantController::RegisterUserPrefs(user_prefs); NetPrefObserver::RegisterPrefs(user_prefs); ProtocolHandlerRegistry::RegisterPrefs(user_prefs); |