Revert "Revert "Put the close button of a notification into focus chain.""

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"
 #include "components/exo/surface.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/display/screen.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/transform.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/views/custom_notification_view.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
+#include "ui/views/focus/focus_manager.h"
 #include "ui/views/painter.h"
+#include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_util.h"
 
 namespace arc {
 
 class ArcCustomNotificationView::EventForwarder : public ui::EventHandler {
  public:
   explicit EventForwarder(ArcCustomNotificationView* owner) : owner_(owner) {}
   ~EventForwarder() override = default;
 
@@ skipping 130 matching lines @@
   bool IsPinned() const override {
     return owner_->floating_close_button_ == nullptr;
   }
 
  private:
   ArcCustomNotificationView* const owner_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewDelegate);
 };
 
+class ArcCustomNotificationView::CloseButton : public views::ImageButton {
+ public:
+  explicit CloseButton(ArcCustomNotificationView* owner)
+      : views::ImageButton(owner), owner_(owner) {
+    set_background(
+        views::Background::CreateSolidBackground(SK_ColorTRANSPARENT));
+    SetFocusForPlatform();
+    SetFocusPainter(views::Painter::CreateSolidFocusPainter(
+        message_center::kFocusBorderColor, gfx::Insets(1, 2, 2, 2)));
+
+    // The sizes below are in DIPs.
+    constexpr int kPaddingFromBorder = 4;
+    constexpr int kImageSize = 16;
+    constexpr int kTouchExtendedPadding =
+        message_center::kControlButtonSize - kImageSize - kPaddingFromBorder;
+    SetBorder(
+        views::CreateEmptyBorder(kPaddingFromBorder, kTouchExtendedPadding,
+                                 kTouchExtendedPadding, kPaddingFromBorder));
+
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    SetImage(views::CustomButton::STATE_NORMAL,
+             rb.GetImageSkiaNamed(IDR_ARC_NOTIFICATION_CLOSE));
+    set_animate_on_state_change(false);
+    SetAccessibleName(l10n_util::GetStringUTF16(
+        IDS_MESSAGE_CENTER_CLOSE_NOTIFICATION_BUTTON_ACCESSIBLE_NAME));
+    SetTooltipText(l10n_util::GetStringUTF16(
+        IDS_MESSAGE_CENTER_CLOSE_NOTIFICATION_BUTTON_TOOLTIP));
+  }
+
+  void OnFocus() override {
+    views::ImageButton::OnFocus();
+    owner_->UpdateCloseButtonVisiblity();
+  }
+
+  void OnBlur() override {
+    views::ImageButton::OnBlur();
+    owner_->UpdateCloseButtonVisiblity();
+  }
+
+ private:
+  ArcCustomNotificationView* const owner_;
+};
+
 ArcCustomNotificationView::ArcCustomNotificationView(
     ArcCustomNotificationItem* item)
     : item_(item),
       notification_key_(item->notification_key()),
       event_forwarder_(new EventForwarder(this)) {
   SetFocusBehavior(FocusBehavior::ALWAYS);
 
   item_->IncrementWindowRefCount();
   item_->AddObserver(this);
 
@@ skipping 21 matching lines @@
 
 std::unique_ptr<message_center::CustomNotificationContentViewDelegate>
 ArcCustomNotificationView::CreateContentViewDelegate() {
   return base::MakeUnique<ArcCustomNotificationView::ContentViewDelegate>(this);
 }
 
 void ArcCustomNotificationView::CreateFloatingCloseButton() {
   if (!surface_)
     return;
 
-  // TODO(yhanada): Make the close button get focus after the entire
-  // notification
-  floating_close_button_ = new views::ImageButton(this);
-  floating_close_button_->set_background(
-      views::Background::CreateSolidBackground(SK_ColorTRANSPARENT));
-  floating_close_button_->SetFocusForPlatform();
-  floating_close_button_->SetFocusPainter(
-      views::Painter::CreateSolidFocusPainter(message_center::kFocusBorderColor,
-                                              gfx::Insets(1, 2, 2, 2)));
-
-  // 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::CreateEmptyBorder(kPaddingFromBorder, kTouchExtendedPadding,
-                               kTouchExtendedPadding, kPaddingFromBorder));
-
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  floating_close_button_->SetImage(
-      views::CustomButton::STATE_NORMAL,
-      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));
-  floating_close_button_->SetTooltipText(l10n_util::GetStringUTF16(
-        IDS_MESSAGE_CENTER_CLOSE_NOTIFICATION_BUTTON_TOOLTIP));
+  floating_close_button_ = new CloseButton(this);
 
   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);
   floating_close_button_widget_->Init(params);
   floating_close_button_widget_->SetContentsView(floating_close_button_);
 
+  // Put the close button into the focus chain.
+  floating_close_button_widget_->SetFocusTraversableParent(
+      GetWidget()->GetFocusTraversable());
+  floating_close_button_widget_->SetFocusTraversableParentView(this);
+
   Layout();
 }
 
 void ArcCustomNotificationView::SetSurface(exo::NotificationSurface* surface) {
   if (surface_ == surface)
     return;
 
   // Reset |floating_close_button_widget_| when |surface_| is changed.
   floating_close_button_widget_.reset();
 
@@ skipping 191 matching lines @@
   static_cast<message_center::CustomNotificationView*>(parent())
       ->OnContentFocused();
 }
 
 void ArcCustomNotificationView::OnBlur() {
   NativeViewHost::OnBlur();
   static_cast<message_center::CustomNotificationView*>(parent())
       ->OnContentBlured();
 }
 
+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();
   }
 }
 
 void ArcCustomNotificationView::OnWindowBoundsChanged(
     aura::Window* window,
     const gfx::Rect& old_bounds,
@@ skipping 33 matching lines @@
 
 void ArcCustomNotificationView::OnNotificationSurfaceRemoved(
     exo::NotificationSurface* surface) {
   if (surface->notification_id() != notification_key_)
     return;
 
   SetSurface(nullptr);
 }
 
 }  // namespace arc