| 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 a5625574632f809b7a1cd10192412a21349056b6..1b1d62dc5c80df1f723066b2cf22cb97f6351734 100644
|
| --- a/chrome/browser/notifications/notification_ui_manager.cc
|
| +++ b/chrome/browser/notifications/notification_ui_manager.cc
|
| @@ -4,13 +4,10 @@
|
|
|
| #include "chrome/browser/notifications/notification_ui_manager.h"
|
|
|
| -#include "chrome/browser/notifications/balloon_notification_ui_manager.h"
|
| -
|
| -#if defined(ENABLE_MESSAGE_CENTER)
|
| #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 "ui/message_center/message_center_util.h"
|
| -#endif
|
|
|
| // static
|
| bool NotificationUIManager::DelegatesToMessageCenter() {
|
| @@ -19,20 +16,17 @@ bool NotificationUIManager::DelegatesToMessageCenter() {
|
| // the message center.
|
| #if defined(OS_CHROMEOS)
|
| return true;
|
| -#elif defined(ENABLE_MESSAGE_CENTER)
|
| - return message_center::IsRichNotificationEnabled();
|
| #endif
|
| - return false;
|
| + return message_center::IsRichNotificationEnabled();
|
| }
|
|
|
| #if !defined(OS_MACOSX)
|
| // static
|
| NotificationUIManager* NotificationUIManager::Create(PrefService* local_state) {
|
| -#if defined(ENABLE_MESSAGE_CENTER)
|
| if (DelegatesToMessageCenter())
|
| return new MessageCenterNotificationManager(
|
| g_browser_process->message_center());
|
| -#endif
|
| +
|
| BalloonNotificationUIManager* balloon_manager =
|
| new BalloonNotificationUIManager(local_state);
|
| balloon_manager->SetBalloonCollection(BalloonCollection::Create());
|
|
|