[Download Notification] Use NotificationUIManager instead of MessageCenter

chrome/browser/download/notification/download_notification_item.h

 // Copyright 2015 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_DOWNLOAD_NOTIFICATION_DOWNLOAD_NOTIFICATION_ITEM_H_
 #define CHROME_BROWSER_DOWNLOAD_NOTIFICATION_DOWNLOAD_NOTIFICATION_ITEM_H_
 
 #include "chrome/browser/download/notification/download_notification_item.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/download/download_commands.h"
+#include "chrome/browser/notifications/notification.h"
+#include "chrome/browser/notifications/notification_delegate.h"
+#include "chrome/browser/notifications/notification_test_util.h"
 #include "content/public/browser/download_item.h"
 #include "grit/theme_resources.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_observer.h"
-#include "ui/message_center/notification.h"
-#include "ui/message_center/notification_delegate.h"
-
-using message_center::Notification;
 
 namespace test {
 class DownloadNotificationItemTest;
 }
 
-class DownloadNotificationItem : public content::DownloadItem::Observer {
+class DownloadNotificationItem
+    : public base::SupportsWeakPtr<DownloadNotificationItem>,
+      public content::DownloadItem::Observer {
  public:
   class Delegate {
    public:
     virtual void OnDownloadStarted(DownloadNotificationItem* item) = 0;
     virtual void OnDownloadStopped(DownloadNotificationItem* item) = 0;
     virtual void OnDownloadRemoved(DownloadNotificationItem* item) = 0;
   };
 
-  DownloadNotificationItem(content::DownloadItem* item, Delegate* delegate);
+  static const char kDownloadNotificationOrigin[];
+
+  DownloadNotificationItem(content::DownloadItem* item,
+                           Profile* profile,
+                           Delegate* delegate);
 
   ~DownloadNotificationItem() override;
 
  private:
-  class NotificationWatcher : public message_center::NotificationDelegate,
-                              public message_center::MessageCenterObserver {
+  class NotificationWatcher : public NotificationDelegate {
    public:
     explicit NotificationWatcher(DownloadNotificationItem* item);
 
+    // NotificationDelegate overrides:
+    void Close(bool by_user) override;
+    void Click() override;
+    bool HasClickedListener() override;
+    void ButtonClick(int button_index) override;
+    std::string id() const override;
+
    private:
     ~NotificationWatcher() override;
 
-    // message_center::NotificationDelegate overrides:
-    void Close(bool by_user) override;
-    void Click() override;
-    bool HasClickedListener() override;
-    void ButtonClick(int button_index) override;
-
-    // message_center::MessageCenterObserver overrides:
-    void OnNotificationRemoved(const std::string& id, bool by_user) override;
-
     DownloadNotificationItem* item_;
   };
 
+  // Replaces the NotificationUIManager for tests.
+  static void SetStubNotificationUIManagerForTesting(
+      StubNotificationUIManager* stub_notification_ui_manager) {
+    stub_notification_ui_manager_for_testing_ = stub_notification_ui_manager;
+  }
+  static StubNotificationUIManager* stub_notification_ui_manager_for_testing_;

[Randy Smith (Not in Mondays), 2015/04/10 21:43:19]

According to the style guide, all data members should be after all methods.

[yoshiki, 2015/04/13 15:51:53]

Done.

+
+  friend class test::DownloadNotificationItemTest;

[Randy Smith (Not in Mondays), 2015/04/10 21:43:19]

I'm used to friending being the first thing in each section (i.e. I'd expect
this line to be at the beginning of the private section).  The style guide
doesn't specifically mention where friend decls should go in the order, but it
does imply that all things of a type (constants, methods, data members) should
be grouped together.

[yoshiki, 2015/04/13 15:51:53]

I agree that. Done.

+
+  // Methods called from NotificationWatcher.
   void OnNotificationClick();
   void OnNotificationButtonClick(int button_index);
-  void OnNotificationClose(bool by_user);
-  void OnNotificationRemoved(bool by_user);
 
   // DownloadItem::Observer overrides:
   void OnDownloadUpdated(content::DownloadItem* item) override;
   void OnDownloadOpened(content::DownloadItem* item) override;
   void OnDownloadRemoved(content::DownloadItem* item) override;
   void OnDownloadDestroyed(content::DownloadItem* item) override;
 
   void UpdateNotificationData();
   void SetNotificationImage(int resource_id);
 
+  NotificationUIManager* notification_ui_manager() const;
+
   // Returns a short one-line status string for the download.
   base::string16 GetTitle() const;
 
   // Returns a short one-line status string for a download command.
   base::string16 GetCommandLabel(DownloadCommands::Command command) const;
 
   // Get the warning test to notify a dangerous download. Should only be called
   // if IsDangerous() is true.
   base::string16 GetWarningText() const;
 
   scoped_ptr<std::vector<DownloadCommands::Command>> GetPossibleActions() const;
 
   bool openable_;
   bool downloading_;
-  bool reshow_after_remove_;
   int image_resource_id_;
+  Profile* profile_;
   scoped_refptr<NotificationWatcher> watcher_;
 
-  message_center::MessageCenter* message_center_;
   scoped_ptr<Notification> notification_;
 
   content::DownloadItem* item_;
   scoped_ptr<std::vector<DownloadCommands::Command>> button_actions_;
 
   Delegate* const delegate_;
 
-  friend class test::DownloadNotificationItemTest;
-
   DISALLOW_COPY_AND_ASSIGN(DownloadNotificationItem);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_NOTIFICATION_DOWNLOAD_NOTIFICATION_ITEM_H_