| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index 4992da832b831b0e82d74ab6c24f1d2463ad3210..a9a4e54c1e5aec7bb9d1410f2cf4ff7c649c8fac 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -43,6 +43,7 @@
|
| #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
|
| #include "chrome/browser/net/ssl_config_service_manager.h"
|
| #include "chrome/browser/notifications/desktop_notification_service.h"
|
| +#include "chrome/browser/notifications/extension_welcome_notification.h"
|
| #include "chrome/browser/notifications/message_center_notification_manager.h"
|
| #include "chrome/browser/pepper_flash_settings_manager.h"
|
| #include "chrome/browser/plugins/plugin_finder.h"
|
| @@ -428,6 +429,13 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| DesktopNotificationService::RegisterProfilePrefs(registry);
|
| #endif
|
|
|
| +#if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS) && \
|
| + !defined(OS_ANDROID)
|
| + // The extension welcome notification requires a build that enables extensions
|
| + // and notifications, and uses the UI message center.
|
| + ExtensionWelcomeNotification::RegisterProfilePrefs(registry);
|
| +#endif
|
| +
|
| #if defined(ENABLE_SERVICE_DISCOVERY)
|
| LocalDiscoveryUI::RegisterProfilePrefs(registry);
|
| #endif
|
|
|