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

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

Issue 15025002: Remove ENABLE_MESSAGE_CENTER (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing static initializer Created 7 years, 7 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/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());
« no previous file with comments | « chrome/browser/notifications/notification_browsertest.cc ('k') | chrome/browser/notifications/notification_ui_manager_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698