From aaba38dc4f74a9e00232417e56bc4a8126aa3093 Mon Sep 17 00:00:00 2001 From: "johnnyg@chromium.org" Date: Fri, 12 Nov 2010 03:28:01 +0000 Subject: 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 --- chrome/browser/cocoa/notifications/balloon_controller.mm | 1 - chrome/browser/cocoa/notifications/balloon_controller_unittest.mm | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'chrome/browser/cocoa') diff --git a/chrome/browser/cocoa/notifications/balloon_controller.mm b/chrome/browser/cocoa/notifications/balloon_controller.mm index 048888c..3f8a8b0 100644 --- a/chrome/browser/cocoa/notifications/balloon_controller.mm +++ b/chrome/browser/cocoa/notifications/balloon_controller.mm @@ -17,7 +17,6 @@ #include "chrome/browser/cocoa/notifications/balloon_view_host_mac.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/desktop_notification_service.h" -#include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_options_menu_model.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm index 31f7c15..6f6a1ab 100644 --- a/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm @@ -30,8 +30,7 @@ namespace { class MockBalloonCollection : public BalloonCollection { virtual void Add(const Notification& notification, Profile* profile) {} - virtual bool RemoveById(const std::string& id) { return false; } - virtual bool RemoveBySourceOrigin(const GURL& origin) { return false; } + virtual bool Remove(const Notification& notification) { return false; } virtual bool HasSpace() const { return true; } virtual void ResizeBalloon(Balloon* balloon, const gfx::Size& size) {}; virtual void DisplayChanged() {} -- cgit v1.1