| Index: chrome/browser/notifications/notification_ui_manager.cc
|
| diff --git a/chrome/browser/notifications/notification_ui_manager.cc b/chrome/browser/notifications/notification_ui_manager.cc
|
| index 8bbafe7e6c60c1cc86ad11c8d2c7c341345296a7..19e6c242d0ba1d99fff69808727fa782338d515e 100644
|
| --- a/chrome/browser/notifications/notification_ui_manager.cc
|
| +++ b/chrome/browser/notifications/notification_ui_manager.cc
|
| @@ -4,10 +4,14 @@
|
|
|
| #include "chrome/browser/notifications/notification_ui_manager.h"
|
|
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/notifications/balloon_notification_ui_manager.h"
|
| #include "chrome/browser/notifications/message_center_notification_manager.h"
|
| +#include "chrome/browser/notifications/message_center_settings_controller.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/profiles/profile_info_cache.h"
|
| +#include "chrome/browser/profiles/profile_manager.h"
|
| #include "ui/message_center/message_center_util.h"
|
|
|
| // static
|
| @@ -24,9 +28,16 @@ bool NotificationUIManager::DelegatesToMessageCenter() {
|
| #if !defined(OS_MACOSX)
|
| // static
|
| NotificationUIManager* NotificationUIManager::Create(PrefService* local_state) {
|
| - if (DelegatesToMessageCenter())
|
| + if (DelegatesToMessageCenter()) {
|
| + ProfileInfoCache* profile_info_cache =
|
| + &g_browser_process->profile_manager()->GetProfileInfoCache();
|
| + scoped_ptr<message_center::NotifierSettingsProvider> settings_provider(
|
| + new MessageCenterSettingsController(profile_info_cache));
|
| return new MessageCenterNotificationManager(
|
| - g_browser_process->message_center(), local_state);
|
| + g_browser_process->message_center(),
|
| + local_state,
|
| + settings_provider.Pass());
|
| + }
|
|
|
| BalloonNotificationUIManager* balloon_manager =
|
| new BalloonNotificationUIManager(local_state);
|
|
|