Chromium Code Reviews| Index: chrome/browser/prefs/browser_prefs.cc |
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc |
| index a8f44d37e84650c5e422ad4c4aa5ba532a94d2da..dcdd94f674c73db1b0b2d8adae55cbbfb75e756c 100644 |
| --- a/chrome/browser/prefs/browser_prefs.cc |
| +++ b/chrome/browser/prefs/browser_prefs.cc |
| @@ -198,7 +198,6 @@ void RegisterUserPrefs(PrefService* 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) |
| @@ -210,6 +209,7 @@ void RegisterUserPrefs(PrefService* user_prefs) { |
| ChromeLauncherDelegate::RegisterUserPrefs(user_prefs); |
| #endif |
| #if !defined(OS_ANDROID) |
| + SyncPromoUI::RegisterUserPrefs(user_prefs); |
|
Yaron
2012/02/29 00:02:17
I think this is merged in from Jesse's change.
|
| PluginsUI::RegisterUserPrefs(user_prefs); |
| PromoResourceService::RegisterUserPrefs(user_prefs); |
| #endif |