Not Remove Non-Closable Arc Popup When Close Button is Pressed

ui/arc/notification/arc_custom_notification_item.cc

 // 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.
 
 #include "ui/arc/notification/arc_custom_notification_item.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/arc/notification/arc_custom_notification_view.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/custom_notification_content_view_delegate.h"
 
 namespace arc {
 
 namespace {
 
 constexpr char kNotifierId[] = "ARC_NOTIFICATION";
 
 class ArcNotificationDelegate : public message_center::NotificationDelegate {
  public:
   explicit ArcNotificationDelegate(ArcCustomNotificationItem* item)
-      : item_(item) {}
+      : item_(item) {
+    DCHECK(item_);
+  }
 
-  std::unique_ptr<message_center::CustomContent> CreateCustomContent()
-      override {
-    auto view = base::MakeUnique<ArcCustomNotificationView>(item_);
+  std::unique_ptr<message_center::CustomContent> CreateCustomContent(
+      message_center::MessageView* parent) override {
+    auto view = base::MakeUnique<ArcCustomNotificationView>(item_, parent);
     auto content_view_delegate = view->CreateContentViewDelegate();
     return base::MakeUnique<message_center::CustomContent>(
         std::move(view), std::move(content_view_delegate));
   }
 
+  void Close(bool by_user) override { item_->Close(by_user); }
+
  private:
   // The destructor is private since this class is ref-counted.
   ~ArcNotificationDelegate() override {}
 
   ArcCustomNotificationItem* const item_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcNotificationDelegate);
 };
 
 }  // namespace
@@ skipping 52 matching lines @@
     snapshot_ = gfx::ImageSkia(gfx::ImageSkiaRep(
         *data->snapshot_image, data->snapshot_image_scale));
   }
 
   for (auto& observer : observers_)
     observer.OnItemUpdated();
 
   AddToMessageCenter();
 }
 
-void ArcCustomNotificationItem::CloseFromCloseButton() {
-  // Needs to manually remove notification from MessageCenter because

[yoshiki, 2017/02/06 22:22:22]

This comment was wrong. We didn't need to call "Close(true)" if we handled
ArcNotificationDelegate::Close() correctly.

-  // the floating close button is not part of MessageCenter.
-  message_center()->RemoveNotification(notification_id(), true);
-  Close(true);
-}
-
 void ArcCustomNotificationItem::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void ArcCustomNotificationItem::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void ArcCustomNotificationItem::IncrementWindowRefCount() {
   ++window_ref_count_;
   if (window_ref_count_ == 1)
     manager()->CreateNotificationWindow(notification_key());
 }
 
 void ArcCustomNotificationItem::DecrementWindowRefCount() {
   DCHECK_GT(window_ref_count_, 0);
   --window_ref_count_;
   if (window_ref_count_ == 0)
     manager()->CloseNotificationWindow(notification_key());
 }
 
 }  // namespace arc