Factor Google Now welcome notifications out of DesktopNotificationService.

chrome/browser/prefs/browser_prefs.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 25 matching lines @@
 #include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 #include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/browser/net/http_server_properties_manager_factory.h"
 #include "chrome/browser/net/net_pref_observer.h"
 #include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/net/predictor.h"
 #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/extensions/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"
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/printing/print_dialog_cloud.h"
 #include "chrome/browser/profiles/chrome_version_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 362 matching lines @@
 #if defined(ENABLE_MANAGED_USERS)
   SupervisedUserService::RegisterProfilePrefs(registry);
   SupervisedUserSharedSettingsService::RegisterProfilePrefs(registry);
   SupervisedUserSyncService::RegisterProfilePrefs(registry);
 #endif
 
 #if defined(ENABLE_NOTIFICATIONS)
   DesktopNotificationService::RegisterProfilePrefs(registry);
 #endif
 
+#if defined(ENABLE_NOTIFICATIONS) && defined(ENABLE_EXTENSIONS)
+  ExtensionWelcomeNotification::RegisterProfilePrefs(registry);

[robliao, 2014/09/18 20:13:06]

And a quick question here. What happens if there is a
MessageCenterNotificationManager Registration but no
ExtensionWelcomeNotification registration?

[Peter Beverloo, 2014/09/19 13:01:22]

Hm, this would occur for an Android build which enables both notifications and
extensions. I've updated the #ifdef to check for !ANDROID as well.

What would happen -- I'm not sure, I'm not familiar enough with the preference
system to comment on that. Quickly checking with bauerb@ revealed that we'd hit
a DCHECK.

+#endif
+
 #if defined(ENABLE_SERVICE_DISCOVERY)
   LocalDiscoveryUI::RegisterProfilePrefs(registry);
 #endif
 
 #if defined(OS_ANDROID)
   chrome_variations::VariationsService::RegisterProfilePrefs(registry);
   NewTabPagePrefs::RegisterProfilePrefs(registry);
   PartnerBookmarksShim::RegisterProfilePrefs(registry);
 #else
   AppShortcutManager::RegisterProfilePrefs(registry);
@@ skipping 172 matching lines @@
 #if defined(OS_CHROMEOS)
   chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
 #endif
 
 #if defined(TOOLKIT_VIEWS)
   MigrateBrowserTabStripPrefs(local_state);
 #endif
 }
 
 }  // namespace chrome