summaryrefslogtreecommitdiffstats
path: root/chrome/browser/background
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-11 00:59:14 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-11 00:59:14 +0000
commit93b1c4e979784d6741cad83cedbc2405878b0ecf (patch)
treee653029e2eba8f44d4c2565f46fdf1785121dd4b /chrome/browser/background
parente0e9dff62d8dfb9d43259e54a0e01c21e2b4c062 (diff)
downloadchromium_src-93b1c4e979784d6741cad83cedbc2405878b0ecf.zip
chromium_src-93b1c4e979784d6741cad83cedbc2405878b0ecf.tar.gz
chromium_src-93b1c4e979784d6741cad83cedbc2405878b0ecf.tar.bz2
Remove balloon notification code. The last user was the Linux GTK port but that's deleted now.
BUG=297026, 361784 R=mukai@chromium.org, stevenjb@chromium.org Review URL: https://codereview.chromium.org/231723006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/background')
-rw-r--r--chrome/browser/background/background_contents_service.cc2
-rw-r--r--chrome/browser/background/background_contents_service_unittest.cc9
2 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc
index 9dbe637a..b4b0cec 100644
--- a/chrome/browser/background/background_contents_service.cc
+++ b/chrome/browser/background/background_contents_service.cc
@@ -72,7 +72,7 @@ void CloseBalloon(const std::string& balloon_id) {
g_browser_process->notification_ui_manager();
bool cancelled ALLOW_UNUSED = notification_ui_manager->CancelById(balloon_id);
#if defined(ENABLE_NOTIFICATIONS)
- if (cancelled && message_center::IsRichNotificationEnabled()) {
+ if (cancelled) {
// TODO(dewittj): Add this functionality to the notification UI manager's
// API.
g_browser_process->message_center()->SetVisibility(
diff --git a/chrome/browser/background/background_contents_service_unittest.cc b/chrome/browser/background/background_contents_service_unittest.cc
index 68f35cb..9f7d075 100644
--- a/chrome/browser/background/background_contents_service_unittest.cc
+++ b/chrome/browser/background/background_contents_service_unittest.cc
@@ -162,9 +162,6 @@ class BackgroundContentsServiceNotificationTest
// Overridden from testing::Test
virtual void SetUp() {
BrowserWithTestWindowTest::SetUp();
- if (!NotificationUIManager::DelegatesToMessageCenter())
- return;
-
// In ChromeOS environment, BrowserWithTestWindowTest initializes
// MessageCenter.
#if !defined(OS_CHROMEOS)
@@ -348,9 +345,6 @@ TEST_F(BackgroundContentsServiceTest, TestApplicationIDLinkage) {
#if defined(ENABLE_NOTIFICATIONS) && !defined(TOOLKIT_GTK)
TEST_F(BackgroundContentsServiceNotificationTest, TestShowBalloon) {
- if (!NotificationUIManager::DelegatesToMessageCenter())
- return;
-
scoped_refptr<extensions::Extension> extension =
extension_test_util::LoadManifest("image_loading_tracker", "app.json");
ASSERT_TRUE(extension.get());
@@ -363,9 +357,6 @@ TEST_F(BackgroundContentsServiceNotificationTest, TestShowBalloon) {
// Verify if a test notification can show the default extension icon for
// a crash notification for an extension without icon.
TEST_F(BackgroundContentsServiceNotificationTest, TestShowBalloonNoIcon) {
- if (!NotificationUIManager::DelegatesToMessageCenter())
- return;
-
// Extension manifest file with no 'icon' field.
scoped_refptr<extensions::Extension> extension =
extension_test_util::LoadManifest("app", "manifest.json");