diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 01:37:28 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 01:37:28 +0000 |
| commit | cb0612ea5b10d6003de853d0339869df5adcc985 (patch) | |
| tree | 8c35892981e70a57095fa39b5ac88cfca055172b /chrome/browser/task_manager | |
| parent | 73b18974f1241da48074c495b261429bff751a4a (diff) | |
| download | chromium_src-cb0612ea5b10d6003de853d0339869df5adcc985.zip chromium_src-cb0612ea5b10d6003de853d0339869df5adcc985.tar.gz chromium_src-cb0612ea5b10d6003de853d0339869df5adcc985.tar.bz2 | |
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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=65879
Review URL: http://codereview.chromium.org/4635007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
| -rw-r--r-- | chrome/browser/task_manager/task_manager_browsertest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index 91cc23d..bc2655a 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/extensions/crashed_extension_infobar.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/notifications/desktop_notification_service.h" +#include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_test_util.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/profile.h" @@ -200,9 +201,9 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeNotificationChanges) { WaitForResourceChange(3); notifications->Add(n2, browser()->profile()); WaitForResourceChange(4); - notifications->Cancel(n1); + notifications->CancelById(n1.notification_id()); WaitForResourceChange(3); - notifications->Cancel(n2); + notifications->CancelById(n2.notification_id()); WaitForResourceChange(2); } |