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

Unified Diff: chrome/browser/background/background_contents_service.cc

Issue 2555833002: Remove enable_notifications build flag and define (Closed)
Patch Set: Merge Created 4 years 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/background/background_contents_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/background/background_contents_service.cc
diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc
index 9aa96dba52988379012b18bdc21c7ebc5e5b1b65..99e2628629e651784471f010aa6e0b9b7e9edf7e 100644
--- a/chrome/browser/background/background_contents_service.cc
+++ b/chrome/browser/background/background_contents_service.cc
@@ -56,12 +56,9 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image.h"
-
-#if defined(ENABLE_NOTIFICATIONS)
#include "ui/message_center/message_center.h"
#include "ui/message_center/notification_types.h"
#include "ui/message_center/notifier_settings.h"
-#endif
using content::SiteInstance;
using content::WebContents;
@@ -80,12 +77,10 @@ void CloseBalloon(const std::string& balloon_id, ProfileID profile_id) {
g_browser_process->notification_ui_manager();
bool cancelled = notification_ui_manager->CancelById(balloon_id, profile_id);
if (cancelled) {
-#if defined(ENABLE_NOTIFICATIONS)
// TODO(dewittj): Add this functionality to the notification UI manager's
// API.
g_browser_process->message_center()->SetVisibility(
message_center::VISIBILITY_TRANSIENT);
-#endif
}
}
@@ -158,7 +153,6 @@ class CrashNotificationDelegate : public NotificationDelegate {
DISALLOW_COPY_AND_ASSIGN(CrashNotificationDelegate);
};
-#if defined(ENABLE_NOTIFICATIONS)
void NotificationImageReady(
const std::string extension_name,
const base::string16 message,
@@ -192,12 +186,10 @@ void NotificationImageReady(
g_browser_process->notification_ui_manager()->Add(notification, profile);
}
-#endif
// Show a popup notification balloon with a crash message for a given app/
// extension.
void ShowBalloon(const Extension* extension, Profile* profile) {
-#if defined(ENABLE_NOTIFICATIONS)
const base::string16 message = l10n_util::GetStringFUTF16(
extension->is_app() ? IDS_BACKGROUND_CRASHED_APP_BALLOON_MESSAGE :
IDS_BACKGROUND_CRASHED_EXTENSION_BALLOON_MESSAGE,
@@ -220,7 +212,6 @@ void ShowBalloon(const Extension* extension, Profile* profile) {
message,
make_scoped_refptr(new CrashNotificationDelegate(profile, extension)),
profile));
-#endif
}
void ReloadExtension(const std::string& extension_id, Profile* profile) {
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/background/background_contents_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698