Merge ArcNotificationItem and ArcCustomNotificationItem

ui/arc/notification/arc_notification_item.h

 // Copyright 2016 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 UI_ARC_NOTIFICATION_ARC_NOTIFICATION_ITEM_H_
 #define UI_ARC_NOTIFICATION_ARC_NOTIFICATION_ITEM_H_
 
-#include <memory>
-#include <string>
-
 #include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "base/threading/thread_checker.h"
+#include "base/observer_list.h"

[hidehiko, 2017/05/01 12:29:17]

Not necessary to include this?

[yoshiki, 2017/05/08 06:24:53]

Done.

 #include "components/arc/common/notifications.mojom.h"
-#include "components/signin/core/account_id/account_id.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/arc/notification/arc_notification_manager.h"
-#include "ui/message_center/message_center.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace arc {
 
-// The class represents each ARC notification. One instance of this class
-// corresponds to one ARC notification.
 class ArcNotificationItem {
  public:
-  ArcNotificationItem(ArcNotificationManager* manager,
-                      message_center::MessageCenter* message_center,
-                      const std::string& notification_key,
-                      const AccountId& profile_id);
-  virtual ~ArcNotificationItem();
+  class Observer {
+   public:
+    // Invoked when the notification data for this item has changed.
+    virtual void OnItemDestroying() = 0;
 
-  virtual void UpdateWithArcNotificationData(
-      mojom::ArcNotificationDataPtr data);
+    // Invoked when the notification data for the item is updated.
+    virtual void OnItemUpdated() = 0;
+
+   protected:
+    virtual ~Observer() = default;
+  };
+
+  virtual ~ArcNotificationItem() = default;
 
   // Methods called from ArcNotificationManager:

[hidehiko, 2017/05/01 12:29:17]

As this became an interface, could you describe documents for each method in
this class what is the responsibility, and, if necessary, when it is called?

[yoshiki, 2017/05/08 06:24:53]

Done.

-  void OnClosedFromAndroid();
+  virtual void OnClosedFromAndroid() = 0;
+  virtual void UpdateWithArcNotificationData(
+      mojom::ArcNotificationDataPtr data) = 0;
 
   // Methods called from ArcNotificationItemDelegate:

[hidehiko, 2017/05/01 12:29:18]

Could you fix the comments.

[yoshiki, 2017/05/08 06:24:53]

Done.

-  void Close(bool by_user);
-  void Click();
-  void ButtonClick(int button_index);
-  void OpenSettings();
-  bool IsOpeningSettingsSupported() const;
-  void ToggleExpansion();
+  virtual void Close(bool by_user) = 0;
+  virtual void Click() = 0;
+  virtual void OpenSettings() = 0;
+  virtual bool IsOpeningSettingsSupported() const = 0;
+  virtual void ToggleExpansion() = 0;
 
-  const std::string& notification_key() const { return notification_key_; }
+  virtual void CloseFromCloseButton() = 0;

[hidehiko, 2017/05/01 12:29:17]

No caller?

[yoshiki, 2017/05/08 06:24:53]

Removed.

 
- protected:
-  static int ConvertAndroidPriority(
-      mojom::ArcNotificationPriority android_priority);
+  virtual void AddObserver(Observer* observer) = 0;
+  virtual void RemoveObserver(Observer* observer) = 0;
 
-  // Checks whether there is on-going |notification_|.
-  bool HasPendingNotification();
-  // Cache the |data| in |newer_data_|.
-  void CacheArcNotificationData(mojom::ArcNotificationDataPtr data);
+  // Increment |window_ref_count_| and a CreateNotificationWindow request
+  // is sent when |window_ref_count_| goes from zero to one.
+  virtual void IncrementWindowRefCount() = 0;
 
-  // Sets the pending |notification_|.
-  void SetNotification(
-      std::unique_ptr<message_center::Notification> notification);
+  // Decrement |window_ref_count_| and a CloseNotificationWindow request
+  // is sent when |window_ref_count_| goes from one to zero.
+  virtual void DecrementWindowRefCount() = 0;
 
-  // Add |notification_| to message center and update again if there is
-  // |newer_data_|.
-  void AddToMessageCenter();
-
-  bool CalledOnValidThread() const;
-
-  const AccountId& profile_id() const { return profile_id_; }
-  const std::string& notification_id() const { return notification_id_; }
-  message_center::MessageCenter* message_center() { return message_center_; }
-  ArcNotificationManager* manager() { return manager_; }
-
-  message_center::Notification* pending_notification() {
-    return notification_.get();
-  }
-
- private:
-  void OnImageDecoded(const SkBitmap& bitmap);
-
-  ArcNotificationManager* const manager_;
-  message_center::MessageCenter* const message_center_;
-  const AccountId profile_id_;
-
-  const std::string notification_key_;
-  const std::string notification_id_;
-
-  // Stores on-going notification data during the image decoding.
-  // This field will be removed after removing async task of image decoding.
-  std::unique_ptr<message_center::Notification> notification_;
-
-  // The flag to indicate that the removing is initiated by the manager and we
-  // don't need to notify a remove event to the manager.
-  // This is true only when:
-  //   (1) the notification is being removed
-  //   (2) the removing is initiated by manager
-  bool being_removed_by_manager_ = false;
-
-  // Stores the latest notification data which is newer than the on-going data.
-  // If the on-going data is either none or the latest, this is null.
-  // This field will be removed after removing async task of image decoding.
-  mojom::ArcNotificationDataPtr newer_data_;
-
-  base::ThreadChecker thread_checker_;
-  base::WeakPtrFactory<ArcNotificationItem> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(ArcNotificationItem);
+  virtual bool GetPinned() const = 0;
+  virtual const gfx::ImageSkia& GetSnapshot() const = 0;
+  virtual mojom::ArcNotificationExpandState GetExpandState() const = 0;
+  virtual mojom::ArcNotificationShownContents GetShownContents() const = 0;
+  virtual const std::string& GetNotificationKey() const = 0;
 };
 
 }  // namespace arc
 
 #endif  // UI_ARC_NOTIFICATION_ARC_NOTIFICATION_ITEM_H_