Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: chrome/browser/notifications/message_center_notification_manager.cc

Issue 20066003: Update notification settings to allow for multiprofile situations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix message_center_unittests Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/notifications/message_center_notification_manager.cc
diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc
index 0ccc840349e62c074467db65c6b3742d740a4368..1bf663a7c849748c12a26e21f38ff4ba2f08b2f5 100644
--- a/chrome/browser/notifications/message_center_notification_manager.cc
+++ b/chrome/browser/notifications/message_center_notification_manager.cc
@@ -33,14 +33,15 @@ const int kFirstRunIdleDelaySeconds = 1;
MessageCenterNotificationManager::MessageCenterNotificationManager(
message_center::MessageCenter* message_center,
- PrefService* local_state)
+ PrefService* local_state,
+ scoped_ptr<message_center::NotifierSettingsProvider> settings_controller)
: message_center_(message_center),
#if defined(OS_WIN)
first_run_idle_timeout_(
base::TimeDelta::FromSeconds(kFirstRunIdleDelaySeconds)),
weak_factory_(this),
#endif
- settings_controller_(new MessageCenterSettingsController) {
+ settings_controller_(settings_controller.Pass()) {
#if defined(OS_WIN)
first_run_pref_.Init(prefs::kMessageCenterShowedFirstRunBalloon, local_state);
#endif

Powered by Google App Engine
This is Rietveld 408576698