diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 03:28:01 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 03:28:01 +0000 |
| commit | aaba38dc4f74a9e00232417e56bc4a8126aa3093 (patch) | |
| tree | d8ca67d1dc1a6aedac4df8efff08f32c62ccb864 /chrome/browser/notifications/notification_ui_manager.h | |
| parent | a358fd8076527132d37e0262823abe3807da16b8 (diff) | |
| download | chromium_src-aaba38dc4f74a9e00232417e56bc4a8126aa3093.zip chromium_src-aaba38dc4f74a9e00232417e56bc4a8126aa3093.tar.gz chromium_src-aaba38dc4f74a9e00232417e56bc4a8126aa3093.tar.bz2 | |
Revert 65879 - When an extension is uninstalled, close all desktop notifications from that extension.
This change also refactors the balloon collection code to remove duplication between chrome and chromeos.
Removes some gross removal code which was using fake notifications just to get the right ID.
BUG=58266
TEST=open notifications from extension, uninstall extensions
Review URL: http://codereview.chromium.org/4635007
TBR=johnnyg@chromium.org
Review URL: http://codereview.chromium.org/4855002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/notification_ui_manager.h')
| -rw-r--r-- | chrome/browser/notifications/notification_ui_manager.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/notifications/notification_ui_manager.h b/chrome/browser/notifications/notification_ui_manager.h index 6d46198..10687a9 100644 --- a/chrome/browser/notifications/notification_ui_manager.h +++ b/chrome/browser/notifications/notification_ui_manager.h @@ -7,7 +7,6 @@ #pragma once #include <deque> -#include <string> #include "base/id_map.h" #include "base/scoped_ptr.h" @@ -44,14 +43,8 @@ class NotificationUIManager virtual void Add(const Notification& notification, Profile* profile); - // Removes any notifications matching the supplied ID, either currently - // displayed or in the queue. Returns true if anything was removed. - virtual bool CancelById(const std::string& notification_id); - - // Removes any notifications matching the supplied source origin - // (which could be an extension ID), either currently displayed or in the - // queue. Returns true if anything was removed. - virtual bool CancelAllBySourceOrigin(const GURL& source_origin); + // Removes a notification. + virtual bool Cancel(const Notification& notification); // Returns balloon collection. BalloonCollection* balloon_collection() { |