Correctly remove file browser notifications from Ash notification tray.

chrome/browser/notifications/desktop_notification_service.cc

 // Copyright (c) 2012 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/browser/notifications/desktop_notification_service.h"
 
 #include "base/metrics/histogram.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
@@ skipping 220 matching lines @@
   return UTF8ToUTF16("data:text/html;charset=utf-8," +
                       net::EscapeQueryParamValue(data, false));
 }
 
 // static
 std::string DesktopNotificationService::AddNotification(
     const GURL& origin_url,
     const string16& title,
     const string16& message,
     const GURL& icon_url,
+    const string16& replace_id,
     NotificationDelegate* delegate,
     Profile* profile) {
 #if defined(USE_ASH)
   if (IsAshNotifyEnabled()) {
     // For Ash create a non-HTML notification with |icon_url|.
     Notification notification(GURL(), icon_url, title, message,
                               WebKit::WebTextDirectionDefault,
-                              string16(), string16(), delegate);
+                              string16(), replace_id, delegate);
     g_browser_process->notification_ui_manager()->Add(notification, profile);
     return notification.notification_id();
   }
 #endif
   // Generate a data URL embedding the icon URL, title, and message.
   GURL content_url(CreateDataUrl(
       icon_url, title, message, WebKit::WebTextDirectionDefault));
   Notification notification(
-      GURL(), content_url, string16(), string16(), delegate);
+      GURL(), content_url, string16(), replace_id, delegate);
   g_browser_process->notification_ui_manager()->Add(notification, profile);
   return notification.notification_id();
 }
 
 // static
 std::string DesktopNotificationService::AddIconNotification(
     const GURL& origin_url,
     const string16& title,
     const string16& message,
     const gfx::ImageSkia& icon,
+    const string16& replace_id,
     NotificationDelegate* delegate,
     Profile* profile) {
 #if defined(USE_ASH)
   if (IsAshNotifyEnabled()) {
     // For Ash create a non-HTML notification with |icon|.
     Notification notification(GURL(), icon, title, message,
                               WebKit::WebTextDirectionDefault,
-                              string16(), string16(), delegate);
+                              string16(), replace_id, delegate);
     g_browser_process->notification_ui_manager()->Add(notification, profile);
     return notification.notification_id();
   }
 #endif
   GURL icon_url;
   if (!icon.empty())
     icon_url = GURL(web_ui_util::GetImageDataUrl(icon));
   return AddNotification(
-      origin_url, title, message, icon_url, delegate, profile);
+      origin_url, title, message, icon_url, replace_id, delegate, profile);
+}
+
+// static
+void DesktopNotificationService::RemoveNotification(
+    const std::string& notification_id) {
+    g_browser_process->notification_ui_manager()->CancelById(notification_id);
 }
 
 DesktopNotificationService::DesktopNotificationService(Profile* profile,
     NotificationUIManager* ui_manager)
     : profile_(profile),
       ui_manager_(ui_manager) {
   StartObserving();
 }
 
 DesktopNotificationService::~DesktopNotificationService() {
@@ skipping 223 matching lines @@
 
   if (setting == CONTENT_SETTING_ALLOW)
     return WebKit::WebNotificationPresenter::PermissionAllowed;
   if (setting == CONTENT_SETTING_BLOCK)
     return WebKit::WebNotificationPresenter::PermissionDenied;
   if (setting == CONTENT_SETTING_ASK)
     return WebKit::WebNotificationPresenter::PermissionNotAllowed;
   NOTREACHED() << "Invalid notifications settings value: " << setting;
   return WebKit::WebNotificationPresenter::PermissionNotAllowed;
 }