Merge ArcNotificationItem and ArcCustomNotificationItem

ui/arc/notification/arc_custom_notification_item.h

Index: ui/arc/notification/arc_custom_notification_item.h
diff --git a/ui/arc/notification/arc_custom_notification_item.h b/ui/arc/notification/arc_custom_notification_item.h
deleted file mode 100644
index f4ed4567b5d4e0f4f8749b9db0acdb540cd5dea5..0000000000000000000000000000000000000000
--- a/ui/arc/notification/arc_custom_notification_item.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// 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_CUSTOM_NOTIFICATION_ITEM_H_
-#define UI_ARC_NOTIFICATION_ARC_CUSTOM_NOTIFICATION_ITEM_H_
-
-#include "base/macros.h"
-#include "base/observer_list.h"
-#include "ui/arc/notification/arc_notification_item.h"
-#include "ui/gfx/image/image_skia.h"
-
-namespace arc {
-
-class ArcCustomNotificationItem : public ArcNotificationItem {
- public:
-  class Observer {
-   public:
-    // Invoked when the notification data for this item has changed.
-    virtual void OnItemDestroying() = 0;
-
-    // Invoked when the notification data for the item is updated.
-    virtual void OnItemUpdated() = 0;
-
-   protected:
-    virtual ~Observer() = default;
-  };
-
-  ArcCustomNotificationItem(ArcNotificationManager* manager,
-                            message_center::MessageCenter* message_center,
-                            const std::string& notification_key,
-                            const AccountId& profile_id);
-  ~ArcCustomNotificationItem() override;
-
-  void UpdateWithArcNotificationData(
-      mojom::ArcNotificationDataPtr data) override;
-
-  void CloseFromCloseButton();
-
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-
-  // Increment |window_ref_count_| and a CreateNotificationWindow request
-  // is sent when |window_ref_count_| goes from zero to one.
-  void IncrementWindowRefCount();
-
-  // Decrement |window_ref_count_| and a CloseNotificationWindow request
-  // is sent when |window_ref_count_| goes from one to zero.
-  void DecrementWindowRefCount();
-
-  bool pinned() const { return pinned_; }
-  const gfx::ImageSkia& snapshot() const { return snapshot_; }
-  mojom::ArcNotificationExpandState expand_state() const {
-    return expand_state_;
-  }
-  mojom::ArcNotificationShownContents shown_contents() const {
-    return shown_contents_;
-  }
-
- private:
-  bool pinned_ = false;
-  mojom::ArcNotificationExpandState expand_state_ =
-      mojom::ArcNotificationExpandState::FIXED_SIZE;
-  mojom::ArcNotificationShownContents shown_contents_ =
-      mojom::ArcNotificationShownContents::CONTENTS_SHOWN;
-  gfx::ImageSkia snapshot_;
-  int window_ref_count_ = 0;
-
-  base::ObserverList<Observer> observers_;
-
-  DISALLOW_COPY_AND_ASSIGN(ArcCustomNotificationItem);
-};
-
-}  // namespace arc
-
-#endif  // UI_ARC_NOTIFICATION_ARC_CUSTOM_NOTIFICATION_ITEM_H_