Correctly remove file browser notifications from Ash notification tray.

chrome/browser/chromeos/extensions/file_browser_notifications.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/chromeos/extensions/file_browser_notifications.h"
 
 #include "ash/ash_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 89 matching lines @@
   class Delegate : public NotificationDelegate {
    public:
     Delegate(const base::WeakPtr<FileBrowserNotifications>& host,
              const std::string& id)
         : host_(host),
           id_(id) {}
     virtual void Display() OVERRIDE {}
     virtual void Error() OVERRIDE {}
     virtual void Close(bool by_user) OVERRIDE {
       if (host_)
-        host_->HideNotificationById(id_);
+        host_->RemoveNotificationById(id_);
     }
     virtual void Click() OVERRIDE {
       // TODO(tbarzic): Show more info page once we have one.
     }
     virtual std::string id() const OVERRIDE { return id_; }
     virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE {
       return NULL;
     }
 
    private:
@@ skipping 12 matching lines @@
                       const string16& message)
       : profile_(profile),
         type_(type),
         notification_id_(notification_id),
         message_(message) {
     if (!CommandLine::ForCurrentProcess()->HasSwitch(
             ash::switches::kAshNotifyDisabled)) {
       const gfx::ImageSkia& icon =
           *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
               IDR_FILES_APP_ICON);
+      string16 replace_id = UTF8ToUTF16(notification_id_);
       notification_id_ = DesktopNotificationService::AddIconNotification(
-          GURL(), GetTitle(type_), message, icon,
+          GURL(), GetTitle(type_), message, icon, replace_id,
           new Delegate(host->AsWeakPtr(), notification_id_), profile_);
     } else {
       system_notification_.reset(
           new chromeos::SystemNotification(profile_,
                                            notification_id_,
                                            GetIconId(type_),
                                            GetTitle(type_)));
     }
   }
 
@@ skipping 226 matching lines @@
       hidden_notifications_.end()) {
     // Notification was hidden after a delayed show was requested.
     hidden_notifications_.erase(notification_id);
     return;
   }
   NotificationMessage* notification =
       GetNotification(type, notification_id, message);
   notification->Show();
 }
 
-void FileBrowserNotifications::HideNotificationById(const std::string& id) {
-  NotificationMap::iterator it = notification_map_.find(id);
+void FileBrowserNotifications::HideNotificationById(
+    const std::string& notification_id) {
+  NotificationMap::iterator it = notification_map_.find(notification_id);
   if (it != notification_map_.end()) {
-    delete it->second;
-    notification_map_.erase(it);
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+            ash::switches::kAshNotifyDisabled)) {
+      // Will trigger Delegate::Close which will call RemoveNotificationById.
+      DesktopNotificationService::RemoveNotification(notification_id);
+    } else {
+      NotificationMessage* notification = it->second;
+      notification_map_.erase(it);
+      delete notification;
+    }
   } else {
     // Mark as hidden so it does not get shown from a delayed task.
-    hidden_notifications_.insert(id);
+    hidden_notifications_.insert(notification_id);
   }
 }
+
+void FileBrowserNotifications::RemoveNotificationById(
+    const std::string& notification_id) {
+  NotificationMap::iterator it = notification_map_.find(notification_id);
+  if (it != notification_map_.end()) {
+    NotificationMessage* notification = it->second;
+    notification_map_.erase(it);
+    delete notification;
+  }
+}