Eliminate kAshNotifyDisabled and SystemNotification

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"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/notifications/system_notification.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
+#include "chrome/browser/notifications/notification_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ skipping 60 matching lines @@
       break;
     default:
       NOTREACHED();
       id = 0;
   }
   return l10n_util::GetStringUTF16(id);
 }
 
 }  // namespace
 
-// Simple wrapper class to support ether old chromeos SystemNotifications or
-// new ash notifications.
+// Manages file browser notifications. Generates a desktop notification on
+// construction and removes it from the host when closed. Owned by the host.
 class FileBrowserNotifications::NotificationMessage {
  public:
   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 {}
@@ skipping 20 matching lines @@
 
   NotificationMessage(FileBrowserNotifications* host,
                       Profile* profile,
                       NotificationType type,
                       const std::string& notification_id,
                       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, replace_id,
-          new Delegate(host->AsWeakPtr(), notification_id_), profile_);
-    } else {
-      system_notification_.reset(
-          new chromeos::SystemNotification(profile_,
-                                           notification_id_,
-                                           GetIconId(type_),
-                                           GetTitle(type_)));
-    }
+    const gfx::ImageSkia& icon =
+        *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+            IDR_FILES_APP_ICON);
+    string16 replace_id = UTF8ToUTF16(notification_id_);

[oshima, 2012/09/21 21:45:19]

nit: const string16

[stevenjb, 2012/09/24 17:27:04]

Done.

+    DesktopNotificationService::AddIconNotification(
+        GURL(), GetTitle(type_), message, icon, replace_id,
+        new Delegate(host->AsWeakPtr(), notification_id_), profile_);
   }
 
   ~NotificationMessage() {
   }
 
-  void Show() {
-    if (system_notification_.get())
-      system_notification_->Show(message_, false, false);
-    // Ash notifications are shown automatically (only) when created.
-  }
-
-  void Hide() {
-    if (system_notification_.get() && system_notification_->visible())
-      system_notification_->Hide();
-    // Ash notifications are hidden automatically.
-  }
-
-  void set_message(const string16& message) { message_ = message; }
-
  private:
   Profile* profile_;
   NotificationType type_;
   std::string notification_id_;
   string16 message_;
-  scoped_ptr<chromeos::SystemNotification> system_notification_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationMessage);
 };
 
 struct FileBrowserNotifications::MountRequestsInfo {
   bool mount_success_exists;
   bool fail_message_finalized;
   bool fail_notification_shown;
   bool non_parent_device_failed;
   bool device_notification_hidden;
@@ skipping 167 matching lines @@
   if (type == DEVICE_FAIL) {
     MountRequestsMap::const_iterator it = mount_requests_.find(path);
     if (it != mount_requests_.end())
       id.append(base::IntToString(it->second.fail_notifications_count));
   }
 
   id.append(path);
   return id;
 }
 
-FileBrowserNotifications::NotificationMessage*
-FileBrowserNotifications::GetNotification(NotificationType type,
-                                          const std::string& notification_id,
-                                          const string16& message) {
-  NotificationMap::iterator iter = notification_map_.find(notification_id);
-  if (iter != notification_map_.end()) {
-    iter->second->set_message(message);
-    return iter->second;
-  }
-  NotificationMessage* new_message =
-      new NotificationMessage(this, profile_, type, notification_id, message);
-  notification_map_[notification_id] = new_message;
-  return new_message;
-}
-
 void FileBrowserNotifications::ShowNotificationById(
     NotificationType type,
     const std::string& notification_id,
     const string16& message) {
   if (hidden_notifications_.find(notification_id) !=
       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();
+  if (notification_map_.find(notification_id) != notification_map_.end()) {
+    // Remove any existing notification with |notification_id|.
+    // Will trigger Delegate::Close which will call RemoveNotificationById.
+    DesktopNotificationService::RemoveNotification(notification_id);
+    DCHECK(notification_map_.find(notification_id) == notification_map_.end());
+  }
+  // Create a new notification with |notification_id|.
+  NotificationMessage* new_message =
+      new NotificationMessage(this, profile_, type, notification_id, message);
+  notification_map_[notification_id] = new_message;
 }
 
 void FileBrowserNotifications::HideNotificationById(
     const std::string& notification_id) {
   NotificationMap::iterator it = notification_map_.find(notification_id);
   if (it != notification_map_.end()) {
-    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);
-      notification->Hide();
-      delete notification;
-    }
+    // Will trigger Delegate::Close which will call RemoveNotificationById.
+    DesktopNotificationService::RemoveNotification(notification_id);
   } else {
     // Mark as hidden so it does not get shown from a delayed task.
     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);
-    notification->Hide();
     delete notification;
   }
 }