| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index c865132fb01ff4165a34225e472473c34b75e329..001c77ed5d4772dc6812f98ee543d4b39469a473 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -127,7 +127,6 @@
|
| #if defined(OS_ANDROID)
|
| #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
|
| #include "chrome/browser/android/new_tab_page_prefs.h"
|
| -#include "chrome/browser/ui/webui/ntp/android/promo_handler.h"
|
| #else
|
| #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"
|
| #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
|
| @@ -360,7 +359,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| MediaStreamDevicesController::RegisterProfilePrefs(registry);
|
| NetPrefObserver::RegisterProfilePrefs(registry);
|
| NetworkTimeService::RegisterProfilePrefs(registry);
|
| - NewTabUI::RegisterProfilePrefs(registry);
|
| +
|
| password_manager::PasswordManager::RegisterProfilePrefs(registry);
|
| PrefProxyConfigTrackerImpl::RegisterProfilePrefs(registry);
|
| PrefsTabHelper::RegisterProfilePrefs(registry);
|
| @@ -409,7 +408,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| chrome_variations::VariationsService::RegisterProfilePrefs(registry);
|
| NewTabPagePrefs::RegisterProfilePrefs(registry);
|
| PartnerBookmarksShim::RegisterProfilePrefs(registry);
|
| - PromoHandler::RegisterProfilePrefs(registry);
|
| #else
|
| AppShortcutManager::RegisterProfilePrefs(registry);
|
| autofill::GeneratedCreditCardBubbleController::RegisterUserPrefs(registry);
|
| @@ -419,6 +417,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| extensions::ExtensionSettingsHandler::RegisterProfilePrefs(registry);
|
| extensions::TabsCaptureVisibleTabFunction::RegisterProfilePrefs(registry);
|
| first_run::RegisterProfilePrefs(registry);
|
| + NewTabUI::RegisterProfilePrefs(registry);
|
| notifier::ChromeNotifierService::RegisterProfilePrefs(registry);
|
| PepperFlashSettingsManager::RegisterProfilePrefs(registry);
|
| PinnedTabCodec::RegisterProfilePrefs(registry);
|
|
|