summaryrefslogtreecommitdiffstats
path: root/chrome/browser/printing
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 01:37:28 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 01:37:28 +0000
commitcb0612ea5b10d6003de853d0339869df5adcc985 (patch)
tree8c35892981e70a57095fa39b5ac88cfca055172b /chrome/browser/printing
parent73b18974f1241da48074c495b261429bff751a4a (diff)
downloadchromium_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/printing')
-rw-r--r--chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
index 9607e3f..c27b1a3 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc
@@ -124,9 +124,8 @@ void CloudPrintProxyService::OnTokenExpiredNotificationClick() {
void CloudPrintProxyService::TokenExpiredNotificationDone(bool keep_alive) {
if (token_expired_delegate_.get()) {
- g_browser_process->notification_ui_manager()->Cancel(
- Notification(GURL(), GURL(), string16(), string16(),
- token_expired_delegate_.get()));
+ g_browser_process->notification_ui_manager()->CancelById(
+ token_expired_delegate_->id());
token_expired_delegate_ = NULL;
if (!keep_alive)
BrowserList::EndKeepAlive();