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

Side by Side Diff: trunk/src/chrome/browser/notifications/notification_ui_manager.cc

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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/notifications/notification_ui_manager.h" 5 #include "chrome/browser/notifications/notification_ui_manager.h"
6 6
7 #include "chrome/browser/notifications/balloon_notification_ui_manager.h"
8
9 #if defined(ENABLE_MESSAGE_CENTER)
7 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/notifications/balloon_notification_ui_manager.h"
9 #include "chrome/browser/notifications/message_center_notification_manager.h" 11 #include "chrome/browser/notifications/message_center_notification_manager.h"
10 #include "ui/message_center/message_center_util.h" 12 #include "ui/message_center/message_center_util.h"
13 #endif
11 14
12 // static 15 // static
13 bool NotificationUIManager::DelegatesToMessageCenter() { 16 bool NotificationUIManager::DelegatesToMessageCenter() {
14 // In ChromeOS, it always uses MessageCenterNotificationManager. The flag of 17 // In ChromeOS, it always uses MessageCenterNotificationManager. The flag of
15 // --enable-rich-notifications switches the contents and behaviors inside of 18 // --enable-rich-notifications switches the contents and behaviors inside of
16 // the message center. 19 // the message center.
17 #if defined(OS_CHROMEOS) 20 #if defined(OS_CHROMEOS)
18 return true; 21 return true;
22 #elif defined(ENABLE_MESSAGE_CENTER)
23 return message_center::IsRichNotificationEnabled();
19 #endif 24 #endif
20 return message_center::IsRichNotificationEnabled(); 25 return false;
21 } 26 }
22 27
23 #if !defined(OS_MACOSX) 28 #if !defined(OS_MACOSX)
24 // static 29 // static
25 NotificationUIManager* NotificationUIManager::Create(PrefService* local_state) { 30 NotificationUIManager* NotificationUIManager::Create(PrefService* local_state) {
31 #if defined(ENABLE_MESSAGE_CENTER)
26 if (DelegatesToMessageCenter()) 32 if (DelegatesToMessageCenter())
27 return new MessageCenterNotificationManager( 33 return new MessageCenterNotificationManager(
28 g_browser_process->message_center()); 34 g_browser_process->message_center());
29 35 #endif
30 BalloonNotificationUIManager* balloon_manager = 36 BalloonNotificationUIManager* balloon_manager =
31 new BalloonNotificationUIManager(local_state); 37 new BalloonNotificationUIManager(local_state);
32 balloon_manager->SetBalloonCollection(BalloonCollection::Create()); 38 balloon_manager->SetBalloonCollection(BalloonCollection::Create());
33 return balloon_manager; 39 return balloon_manager;
34 } 40 }
35 #endif 41 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698