commit 42219753c0e79431d59af4aeeb769730a9fabfbd
author johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Jan 25 17:38:23 2010
committer johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Jan 25 17:38:23 2010
tree 1ba1097254e156e6951252231c238eda7d8403d8
parent 3fe87738f5042d30977ab6263c6e3565f45b4c3a

If a page is navigated within the same render process, the active notifications need to go out of scope so we don't try to fire events on them back to the original page.

BUG=32862
TEST=reload page then close notification

Review URL: http://codereview.chromium.org/549140

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37019 0039d316-1c4b-4281-b951-d872f2087c98

chrome/renderer/notification_provider.cc

diff --git a/chrome/renderer/notification_provider.cc b/chrome/renderer/notification_provider.cc
index 30ca716..4489951 100644
--- a/chrome/renderer/notification_provider.cc
+++ b/chrome/renderer/notification_provider.cc
@@ -79,6 +79,10 @@
   return handled;
 }
 
+void NotificationProvider::OnNavigate() {
+  //  manager_.Clear();
+}
+
 bool NotificationProvider::ShowHTML(const WebNotification& notification,
                                     int id) {
   // Disallow HTML notifications from non-HTTP schemes.
@@ -126,9 +130,10 @@
   bool found = manager_.GetNotification(id, &notification);
   // |found| may be false if the WebNotification went out of scope in
   // the page before the associated toast was closed by the user.
-  if (found)
+  if (found) {
     notification.dispatchCloseEvent(by_user);
-  manager_.UnregisterNotification(id);
+    manager_.UnregisterNotification(id);
+  }
 }
 
 void NotificationProvider::OnPermissionRequestComplete(int id) {