| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index fd2bd10af811798f538be0e4d4fe98f9ab07360c..9b85c848cf6994cf164576a2f52d3b28dd146197 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"
|
| @@ -357,7 +356,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);
|
| @@ -406,7 +405,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);
|
| @@ -416,6 +414,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);
|
|
|