diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 01:46:07 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 01:46:07 +0000 |
| commit | 301e5f36c2539ddebd68d98eec9a2c91480d477f (patch) | |
| tree | e2f00243ab9367d74fad3f3427a726a771f08b26 /chrome/browser/notifications/balloon_collection_win.cc | |
| parent | cb0612ea5b10d6003de853d0339869df5adcc985 (diff) | |
| download | chromium_src-301e5f36c2539ddebd68d98eec9a2c91480d477f.zip chromium_src-301e5f36c2539ddebd68d98eec9a2c91480d477f.tar.gz chromium_src-301e5f36c2539ddebd68d98eec9a2c91480d477f.tar.bz2 | |
Revert 66571 - 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
TBR=johnnyg@chromium.org
Review URL: http://codereview.chromium.org/5162003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/balloon_collection_win.cc')
| -rw-r--r-- | chrome/browser/notifications/balloon_collection_win.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/notifications/balloon_collection_win.cc b/chrome/browser/notifications/balloon_collection_win.cc index 07bcd18..8915662 100644 --- a/chrome/browser/notifications/balloon_collection_win.cc +++ b/chrome/browser/notifications/balloon_collection_win.cc @@ -44,11 +44,10 @@ void BalloonCollectionImpl::DidProcessMessage(const MSG& msg) { } bool BalloonCollectionImpl::IsCursorInBalloonCollection() const { - const Balloons& balloons = base_.balloons(); - if (balloons.empty()) + if (balloons_.empty()) return false; - gfx::Point upper_left = balloons[balloons.size() - 1]->GetPosition(); + gfx::Point upper_left = balloons_[balloons_.size() - 1]->GetPosition(); gfx::Point lower_right = layout_.GetLayoutOrigin(); gfx::Rect bounds = gfx::Rect(upper_left.x(), |