Correctly remove file browser notifications from Ash notification tray.

chrome/browser/notifications/desktop_notification_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 85 matching lines @@
   static string16 CreateDataUrl(int resource,
                                 const std::vector<std::string>& subst);
 
   // Add a desktop notification. On non-Ash platforms this will generate a HTML
   // notification from the input parameters. On Ash it will generate a normal
   // ash notification. Returns the notification id.
   static std::string AddNotification(const GURL& origin_url,
                                      const string16& title,
                                      const string16& message,
                                      const GURL& icon_url,
+                                     const string16& replace_id,
                                      NotificationDelegate* delegate,
                                      Profile* profile);
 
   // Same as above, but takes a gfx::ImageSkia for the icon instead.
   static std::string AddIconNotification(const GURL& origin_url,
-                                     const string16& title,
-                                     const string16& message,
-                                     const gfx::ImageSkia& icon,
-                                     NotificationDelegate* delegate,
-                                     Profile* profile);
+                                         const string16& title,
+                                         const string16& message,
+                                         const gfx::ImageSkia& icon,
+                                         const string16& replace_id,
+                                         NotificationDelegate* delegate,
+                                         Profile* profile);
+
+  // Remove any active notification corresponding to |notification_id|.
+  static void RemoveNotification(const std::string& notification_id);
 
   // The default content setting determines how to handle origins that haven't
   // been allowed or denied yet. If |provider_id| is not NULL, the id of the
   // provider which provided the default setting is assigned to it.
   ContentSetting GetDefaultContentSetting(std::string* provider_id);
   void SetDefaultContentSetting(ContentSetting setting);
 
   // NOTE: This should only be called on the UI thread.
   void ResetToDefaultContentSetting();
 
@@ skipping 37 matching lines @@
   // Non-owned pointer to the notification manager which manages the
   // UI for desktop toasts.
   NotificationUIManager* ui_manager_;
 
   content::NotificationRegistrar notification_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_