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

Unified Diff: trunk/src/chrome/browser/notifications/notification_ui_manager_mac.mm

Issue 14631021: Revert 199625 "Remove ENABLE_MESSAGE_CENTER" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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: trunk/src/chrome/browser/notifications/notification_ui_manager_mac.mm
===================================================================
--- trunk/src/chrome/browser/notifications/notification_ui_manager_mac.mm (revision 199638)
+++ trunk/src/chrome/browser/notifications/notification_ui_manager_mac.mm (working copy)
@@ -7,11 +7,14 @@
#include "base/mac/cocoa_protocols.h"
#include "base/mac/mac_util.h"
#include "base/strings/sys_string_conversions.h"
-#include "chrome/browser/browser_process.h"
#include "chrome/browser/notifications/notification.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/message_center_notification_manager.h"
#include "ui/message_center/message_center_util.h"
+#endif
@class NSUserNotificationCenter;
@@ -97,12 +100,14 @@
// static
NotificationUIManager* NotificationUIManager::Create(PrefService* local_state) {
+#if defined(ENABLE_MESSAGE_CENTER)
// TODO(rsesek): Remove this function and merge it with the one in
// notification_ui_manager.cc.
if (DelegatesToMessageCenter()) {
return new MessageCenterNotificationManager(
g_browser_process->message_center());
}
+#endif
BalloonNotificationUIManager* balloon_manager = NULL;
if (base::mac::IsOSMountainLionOrLater())

Powered by Google App Engine
This is Rietveld 408576698