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

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

Issue 12096004: Made --enable-rich-notifications flag available to message_center. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased + fixed build issue. Created 7 years, 11 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 1b09a48e763b29ad75279da5744f0ed339baf713..c68b72593d5650c296e72613f701c2f8ffd7dbdb 100644
--- a/chrome/browser/notifications/notification_ui_manager.cc
+++ b/chrome/browser/notifications/notification_ui_manager.cc
@@ -6,11 +6,11 @@
#include "base/command_line.h"
#include "chrome/browser/notifications/balloon_notification_ui_manager.h"
-#include "chrome/common/chrome_switches.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_switches.h"
#endif
// static
@@ -18,10 +18,10 @@ bool NotificationUIManager::DelegatesToMessageCenter() {
// MessageCenterNotificationManager doesn't work quite well with Ash
// right now. Until it matures in ChromeOS, delegating to message center will
// be done by BalloonCollectionImplAsh through BalloonNotificationUIManager.
-// TODO(mukai): remove this #if when that's no problem.
-#if !defined(USE_ASH)
+// TODO(mukai): remove this |&& !defined(USE_ASH)| when that's no problem.
+#if defined(ENABLE_MESSAGE_CENTER) && !defined(USE_ASH)
return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableRichNotifications);
+ message_center::switches::kEnableRichNotifications);
#endif
return false;
}
« no previous file with comments | « chrome/browser/notifications/message_center_notifications_browsertest.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698