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 e59b3494be589e3bf3e4497e19832bd4a977a2c5..835be71815edf3cf6282cdafb5462d9ba788dc76 100644 |
| --- a/chrome/browser/prefs/browser_prefs.cc |
| +++ b/chrome/browser/prefs/browser_prefs.cc |
| @@ -49,9 +49,6 @@ |
| #include "chrome/browser/network_time/network_time_service.h" |
| #include "chrome/browser/notifications/desktop_notification_service.h" |
| #include "chrome/browser/notifications/notification_prefs_manager.h" |
| -#if !defined(OS_ANDROID) |
| -#include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h" |
| -#endif // OS_ANDROID |
| #include "chrome/browser/password_manager/password_generation_manager.h" |
| #include "chrome/browser/password_manager/password_manager.h" |
| #include "chrome/browser/pepper_flash_settings_manager.h" |
| @@ -170,9 +167,11 @@ |
| #endif |
| #if defined(OS_ANDROID) |
| +#include "chrome/browser/android/new_tab_page_prefs.h" |
| #include "chrome/browser/ui/webui/ntp/android/partner_bookmarks_shim.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" |
| #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" |
| #endif |
| @@ -361,6 +360,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| TemplateURLPrepopulateData::RegisterProfilePrefs(registry); |
| TranslatePrefs::RegisterProfilePrefs(registry); |
| +#if defined(OS_ANDROID) |
|
Pam (message me for reviews)
2013/11/02 08:27:25
Please put this in with the other OS_ANDROID secti
apiccion
2013/11/03 17:52:59
Done.
|
| + NewTabPagePrefs::RegisterProfilePrefs(registry); |
| +#endif |
| + |
| #if defined(ENABLE_AUTOFILL_DIALOG) |
| autofill::AutofillDialogController::RegisterProfilePrefs(registry); |
| #endif |