arc: Update notification close button image

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 "components/exo/notification_surface.h"
 #include "components/exo/surface.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 107 matching lines @@
 ArcCustomNotificationView::~ArcCustomNotificationView() {
   SetSurface(nullptr);
   if (item_)
     item_->RemoveObserver(this);
 }
 
 void ArcCustomNotificationView::CreateFloatingCloseButton() {
   floating_close_button_ = new views::ImageButton(this);
   floating_close_button_->set_background(
       views::Background::CreateSolidBackground(SK_ColorTRANSPARENT));
-  floating_close_button_->SetBorder(
-      views::Border::CreateEmptyBorder(5, 5, 5, 5));
+
+  constexpr int kPaddingFromBorder = 4;
+  constexpr int kImageSize = 16;
+  constexpr int kTouchExtendedPadding =

[yoshiki, 2016/08/24 09:24:32]

nit: could you mention about units in comment? I assume these are "dip".

[xiyuan, 2016/08/24 15:26:50]

Done.

+      message_center::kControlButtonSize - kImageSize - kPaddingFromBorder;
+  floating_close_button_->SetBorder(views::Border::CreateEmptyBorder(
+      kPaddingFromBorder, kTouchExtendedPadding, kTouchExtendedPadding,
+      kPaddingFromBorder));
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   floating_close_button_->SetImage(
       views::CustomButton::STATE_NORMAL,
-      rb.GetImageSkiaNamed(IDR_NOTIFICATION_CLOSE));
-  floating_close_button_->SetImage(
-      views::CustomButton::STATE_HOVERED,
-      rb.GetImageSkiaNamed(IDR_NOTIFICATION_CLOSE_HOVER));
-  floating_close_button_->SetImage(
-      views::CustomButton::STATE_PRESSED,
-      rb.GetImageSkiaNamed(IDR_NOTIFICATION_CLOSE_PRESSED));
+      rb.GetImageSkiaNamed(IDR_ARC_NOTIFICATION_CLOSE));
   floating_close_button_->set_animate_on_state_change(false);
   floating_close_button_->SetAccessibleName(l10n_util::GetStringUTF16(
         IDS_MESSAGE_CENTER_CLOSE_NOTIFICATION_BUTTON_ACCESSIBLE_NAME));
 
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.parent = surface_->window();
 
   floating_close_button_widget_.reset(new views::Widget);
@@ skipping 99 matching lines @@
   gfx::Rect close_button_bounds(floating_close_button_->GetPreferredSize());
   close_button_bounds.set_x(surface_local_bounds.right() -
                             close_button_bounds.width());
   close_button_bounds.set_y(surface_local_bounds.y());
   floating_close_button_widget_->SetBounds(close_button_bounds);
 
   UpdateCloseButtonVisiblity();
 }
 
 void ArcCustomNotificationView::OnKeyEvent(ui::KeyEvent* event) {
+  // Do not handle event targeted to the floating close button.
+  if (floating_close_button_widget_ && event->target() &&
+      floating_close_button_widget_->GetNativeWindow() == event->target()) {
+    return;
+  }
+
   // Forward to parent CustomNotificationView to handle keyboard dismissal.
   parent()->OnKeyEvent(event);
 }
 
 void ArcCustomNotificationView::OnGestureEvent(ui::GestureEvent* event) {
+  // Do not handle event targeted to the floating close button.
+  if (floating_close_button_widget_ && event->target() &&
+      floating_close_button_widget_->GetNativeWindow() == event->target()) {
+    return;
+  }
+
   // Forward to parent CustomNotificationView to handle sliding out.
   parent()->OnGestureEvent(event);
   slide_helper_->Update();
 }
 
 void ArcCustomNotificationView::OnMouseEntered(const ui::MouseEvent&) {
   UpdateCloseButtonVisiblity();
 }
 
 void ArcCustomNotificationView::OnMouseExited(const ui::MouseEvent&) {
@@ skipping 33 matching lines @@
   } else if (!item_->pinned() && !floating_close_button_widget_) {
     CreateFloatingCloseButton();
   }
 }
 
 void ArcCustomNotificationView::OnItemNotificationSurfaceRemoved() {
   SetSurface(nullptr);
 }
 
 }  // namespace arc