Merge ArcNotificationItem and ArcCustomNotificationItem

ui/arc/notification/arc_notification_item_impl.h

-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2017 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_
+#ifndef UI_ARC_NOTIFICATION_ARC_NOTIFICATION_ITEM_IMPL_H_
+#define UI_ARC_NOTIFICATION_ARC_NOTIFICATION_ITEM_IMPL_H_
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
-#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_item.h"
 #include "ui/arc/notification/arc_notification_manager.h"
 #include "ui/message_center/message_center.h"
 
 namespace arc {
 
 // The class represents each ARC notification. One instance of this class
 // corresponds to one ARC notification.
-class ArcNotificationItem {
+class ArcNotificationItemImpl : public ArcNotificationItem {
  public:
-  ArcNotificationItem(ArcNotificationManager* manager,
-                      message_center::MessageCenter* message_center,
-                      const std::string& notification_key,
-                      const AccountId& profile_id);
-  virtual ~ArcNotificationItem();
+  ArcNotificationItemImpl(ArcNotificationManager* manager,
+                          message_center::MessageCenter* message_center,
+                          const std::string& notification_key,
+                          const AccountId& profile_id);
+  ~ArcNotificationItemImpl() override;
 
-  virtual void UpdateWithArcNotificationData(
-      mojom::ArcNotificationDataPtr data);
+  void UpdateWithArcNotificationData(
+      mojom::ArcNotificationDataPtr data) override;
 
-  // Methods called from ArcNotificationManager:
-  void OnClosedFromAndroid();
+  void OnClosedFromAndroid() override;

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

// ArcNotificationItem overrides:

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

Done.

+  void Close(bool by_user) override;
+  void Click() override;
+  void CloseFromCloseButton() override;
+  void OpenSettings() override;
+  bool IsOpeningSettingsSupported() const override;
+  void ToggleExpansion() override;
 
-  // Methods called from ArcNotificationItemDelegate:
-  void Close(bool by_user);
-  void Click();
-  void ButtonClick(int button_index);
-  void OpenSettings();
-  bool IsOpeningSettingsSupported() const;
-  void ToggleExpansion();
+  void AddObserver(Observer* observer) override;
+  void RemoveObserver(Observer* observer) override;
 
-  const std::string& notification_key() const { return notification_key_; }
+  void IncrementWindowRefCount() override;
+  void DecrementWindowRefCount() override;
+
+  bool GetPinned() const override;
+  const gfx::ImageSkia& GetSnapshot() const override;
+  mojom::ArcNotificationExpandState GetExpandState() const override;
+  mojom::ArcNotificationShownContents GetShownContents() const override;
+  const std::string& GetNotificationKey() const override;
 
  protected:

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

Because ArcNotificationItemImpl is no longer inherited,
this can be "private:" section?

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

Done.

-  static int ConvertAndroidPriority(
-      mojom::ArcNotificationPriority android_priority);
-
   // Checks whether there is on-going |notification_|.

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

(optional): Also, several util functions can be inlined. Not necessary to
address in this CL, though.

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

Removed unnecessary util methods

   bool HasPendingNotification();
   // Cache the |data| in |newer_data_|.
   void CacheArcNotificationData(mojom::ArcNotificationDataPtr data);
 
   // Sets the pending |notification_|.
   void SetNotification(
       std::unique_ptr<message_center::Notification> notification);
 
   // 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_; }

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

Also, do not need these accessors?

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

Removed

   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_;
 
+  bool pinned_ = false;

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

Comments for each field, please?

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

Done.

+  gfx::ImageSkia snapshot_;
+  mojom::ArcNotificationExpandState expand_state_ =
+      mojom::ArcNotificationExpandState::FIXED_SIZE;
+  mojom::ArcNotificationShownContents shown_contents_ =
+      mojom::ArcNotificationShownContents::CONTENTS_SHOWN;
+  int window_ref_count_ = 0;
+
+  base::ObserverList<Observer> observers_;

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

include base/observer_list.h ?

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

Done.

+
   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_;
+  base::WeakPtrFactory<ArcNotificationItemImpl> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(ArcNotificationItem);
+  DISALLOW_COPY_AND_ASSIGN(ArcNotificationItemImpl);
 };
 
 }  // namespace arc
 
-#endif  // UI_ARC_NOTIFICATION_ARC_NOTIFICATION_ITEM_H_
+#endif  // UI_ARC_NOTIFICATION_ARC_NOTIFICATION_IMPL_ITEM_H_