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

ui/arc/notification/arc_custom_notification_view.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_view.h"
 
 #include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
 #include "base/memory/ptr_util.h"
 #include "components/exo/notification_surface.h"
@@ skipping 204 matching lines @@
   void OnBlur() override {
     views::ImageButton::OnBlur();
     owner_->UpdateCloseButtonVisiblity();
   }
 
  private:
   ArcCustomNotificationView* const owner_;
 };
 
 ArcCustomNotificationView::ArcCustomNotificationView(
-    ArcCustomNotificationItem* item)
+    ArcCustomNotificationItem* item,
+    message_center::MessageView* parent)
     : item_(item),
+      parent_(parent),
       notification_key_(item->notification_key()),
       event_forwarder_(new EventForwarder(this)) {
   SetFocusBehavior(FocusBehavior::ALWAYS);
 
   item_->IncrementWindowRefCount();
   item_->AddObserver(this);
 
   ArcNotificationSurfaceManager::Get()->AddObserver(this);
   exo::NotificationSurface* surface =
       ArcNotificationSurfaceManager::Get()->GetSurface(notification_key_);
@@ skipping 260 matching lines @@
 views::FocusTraversable* ArcCustomNotificationView::GetFocusTraversable() {
   if (floating_close_button_widget_)
     return static_cast<views::internal::RootView*>(
         floating_close_button_widget_->GetRootView());
   return nullptr;
 }
 
 void ArcCustomNotificationView::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   if (item_ && !item_->pinned() && sender == floating_close_button_) {
-    item_->CloseFromCloseButton();
+    parent_->OnCloseButtonPressed();

[dewittj, 2017/02/07 00:03:11]

any reason you didn't just use views::View::parent()?  If it's about casting,
I'd like to see a DCHECK(parent_ == parent()) so that any hierarchy mistakes are
apparent.

[yoshiki, 2017/02/22 08:55:23]

Thanks. I changed the code with using parent(). PTAL again?

   }
 }
 
 void ArcCustomNotificationView::OnWindowBoundsChanged(
     aura::Window* window,
     const gfx::Rect& old_bounds,
     const gfx::Rect& new_bounds) {
   if (in_layout_)
     return;
 
@@ skipping 29 matching lines @@
 
 void ArcCustomNotificationView::OnNotificationSurfaceRemoved(
     exo::NotificationSurface* surface) {
   if (surface->notification_id() != notification_key_)
     return;
 
   SetSurface(nullptr);
 }
 
 }  // namespace arc