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 471 matching lines @@
   UpdateCloseButtonVisiblity();
 }
 
 void ArcCustomNotificationView::OnFocus() {
   NativeViewHost::OnFocus();
   static_cast<message_center::CustomNotificationView*>(parent())
       ->OnContentFocused();
 }
 
 void ArcCustomNotificationView::OnBlur() {
+  CHECK_EQ(message_center::CustomNotificationView::kViewClassName,

[dewittj, 2017/02/28 21:38:48]

Unclear to me whether this should be CHECK or DCHECK.  I guess check would
prevent possible security bugs if this were ever wrong..  Do we have unit tests
that cause OnBlur and ButtonPressed to be called on ArcCustomNotificationViews? 
With these CHECKs in place we need them so that crashes are detected before they
reach a stable channel.

[yoshiki, 2017/03/02 03:33:35]

I'm adding a test, which checks CHECK for ButtonPressed, in a separated patch.
And I'll add tests for OnFocus and OnBlue. 
https://codereview.chromium.org/2723143002/

Can I submit this patch without tests?

+           parent()->GetClassName());
+
   NativeViewHost::OnBlur();
   static_cast<message_center::CustomNotificationView*>(parent())
       ->OnContentBlured();
 }
 
 views::FocusTraversable* ArcCustomNotificationView::GetFocusTraversable() {
+  CHECK_EQ(message_center::CustomNotificationView::kViewClassName,

[dewittj, 2017/02/28 21:38:48]

this doesn't seem to be relevant here?

[yoshiki, 2017/03/02 03:33:35]

Good catch. This should be in OnFocus() instead of here.

+           parent()->GetClassName());
+
   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) {
+  CHECK_EQ(message_center::CustomNotificationView::kViewClassName,
+           parent()->GetClassName());
   if (item_ && !item_->pinned() && sender == floating_close_button_) {
-    item_->CloseFromCloseButton();
+    static_cast<message_center::CustomNotificationView*>(parent())
+        ->OnCloseButtonPressed();
   }
 }
 
 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