Merge "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 13 matching lines @@
 
 namespace arc {
 
 class ArcCustomNotificationView::EventForwarder : public ui::EventHandler {
  public:
   explicit EventForwarder(ArcCustomNotificationView* owner) : owner_(owner) {}
   ~EventForwarder() override = default;
 
  private:
   // ui::EventHandler
-  void OnEvent(ui::Event* event) override { owner_->OnEvent(event); }
+  void OnEvent(ui::Event* event) override {
+    // Do not forward event targeted to the floating close button so that
+    // keyboard press and tap are handled properly.
+    if (owner_->floating_close_button_widget_ && event->target() &&
+        owner_->floating_close_button_widget_->GetNativeWindow() ==
+            event->target()) {
+      return;
+    }
+
+    owner_->OnEvent(event);
+  }
 
   ArcCustomNotificationView* const owner_;
 
   DISALLOW_COPY_AND_ASSIGN(EventForwarder);
 };
 
 class ArcCustomNotificationView::SlideHelper
     : public ui::LayerAnimationObserver {
  public:
   explicit SlideHelper(ArcCustomNotificationView* owner) : owner_(owner) {
@@ skipping 73 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));
+
+  // The sizes below are in DIPs.
+  constexpr int kPaddingFromBorder = 4;
+  constexpr int kImageSize = 16;
+  constexpr int kTouchExtendedPadding =
+      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 157 matching lines @@
   } else if (!item_->pinned() && !floating_close_button_widget_) {
     CreateFloatingCloseButton();
   }
 }
 
 void ArcCustomNotificationView::OnItemNotificationSurfaceRemoved() {
   SetSurface(nullptr);
 }
 
 }  // namespace arc