If a page is navigated within the same render process, the active notificatio...

chrome/renderer/notification_provider.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/notification_provider.h"
 
 #include "base/task.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/render_thread.h"
@@ skipping 61 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_PostDisplayToNotificationObject, OnDisplay);
     IPC_MESSAGE_HANDLER(ViewMsg_PostErrorToNotificationObject, OnError);
     IPC_MESSAGE_HANDLER(ViewMsg_PostCloseToNotificationObject, OnClose);
     IPC_MESSAGE_HANDLER(ViewMsg_PermissionRequestDone,
                         OnPermissionRequestComplete);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
+void NotificationProvider::OnNavigate() {
+  manager_.Clear();
+}
+
 bool NotificationProvider::ShowHTML(const WebNotification& notification,
                                     int id) {
   // Disallow HTML notifications from non-HTTP schemes.
   GURL url = notification.url();
   if (!url.SchemeIs(chrome::kHttpScheme) && !url.SchemeIs(chrome::kHttpsScheme))
     return false;
 
   DCHECK(notification.isHTML());
   return Send(new ViewHostMsg_ShowDesktopNotification(view_->routing_id(),
               GURL(view_->webview()->mainFrame()->url()).GetOrigin(),
@@ skipping 25 matching lines @@
   // the page before the error occurred.
   if (found)
     notification.dispatchErrorEvent(message);
 }
 
 void NotificationProvider::OnClose(int id, bool by_user) {
   WebNotification notification;
   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) {
   WebNotificationPermissionCallback* callback = manager_.GetCallback(id);
   DCHECK(callback);
   callback->permissionRequestComplete();
   manager_.OnPermissionRequestComplete(id);
 }
 
 bool NotificationProvider::Send(IPC::Message* message) {
   return RenderThread::current()->Send(message);
 }