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

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

Issue 231723006: Remove balloon notification code. The last user was the Linux GTK port but that's deleted now. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync after elliot's r263101 Created 6 years, 8 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
===================================================================
--- chrome/browser/notifications/notification_ui_manager.cc (revision 263121)
+++ chrome/browser/notifications/notification_ui_manager.cc (working copy)
@@ -13,41 +13,14 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "ui/message_center/message_center_util.h"
-#if !defined(OS_CHROMEOS)
-#include "chrome/browser/notifications/balloon_notification_ui_manager.h"
-#endif
-
// static
-bool NotificationUIManager::DelegatesToMessageCenter() {
- // In ChromeOS, it always uses MessageCenterNotificationManager. The flag of
- // --enable-rich-notifications switches the contents and behaviors inside of
- // the message center.
-#if defined(OS_CHROMEOS)
- return true;
-#endif
- return message_center::IsRichNotificationEnabled();
-}
-
-// static
NotificationUIManager* NotificationUIManager::Create(PrefService* local_state) {
- if (DelegatesToMessageCenter()) {
- ProfileInfoCache* profile_info_cache =
- &g_browser_process->profile_manager()->GetProfileInfoCache();
- scoped_ptr<message_center::NotifierSettingsProvider> settings_provider(
- new MessageCenterSettingsController(profile_info_cache));
- return new MessageCenterNotificationManager(
- g_browser_process->message_center(),
- local_state,
- settings_provider.Pass());
- }
-
-#if defined(TOOLKIT_GTK)
- BalloonNotificationUIManager* balloon_manager =
- new BalloonNotificationUIManager(local_state);
- balloon_manager->SetBalloonCollection(BalloonCollection::Create());
- return balloon_manager;
-#else
- CHECK(false);
- return NULL;
-#endif
+ ProfileInfoCache* profile_info_cache =
+ &g_browser_process->profile_manager()->GetProfileInfoCache();
+ scoped_ptr<message_center::NotifierSettingsProvider> settings_provider(
+ new MessageCenterSettingsController(profile_info_cache));
+ return new MessageCenterNotificationManager(
+ g_browser_process->message_center(),
+ local_state,
+ settings_provider.Pass());
}

Powered by Google App Engine
This is Rietveld 408576698