Transfer responsibility for providing a close button for a notification to each implementation of M…

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 "base/auto_reset.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/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/painter.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 102 matching lines @@
   }
   void OnLayerAnimationScheduled(ui::LayerAnimationSequence* seq) override {}
 
   ArcCustomNotificationView* const owner_;
   bool sliding_ = false;
   std::unique_ptr<ui::LayerTreeOwner> surface_copy_;
 
   DISALLOW_COPY_AND_ASSIGN(SlideHelper);
 };
 
+class ArcCustomNotificationView::ContentViewDelegate
+    : public message_center::CustomNotificationContentViewDelegate {
+ public:
+  explicit ContentViewDelegate(ArcCustomNotificationView* owner)
+      : owner_(owner) {}
+
+  bool IsCloseButtonFocused() const override {
+    if (owner_->floating_close_button_ == nullptr)
+      return false;
+    return owner_->floating_close_button_->HasFocus();
+  }
+
+  void RequestFocusOnCloseButton() override {
+    if (owner_->floating_close_button_)
+      owner_->floating_close_button_->RequestFocus();
+    owner_->UpdateCloseButtonVisiblity();
+  }
+
+  bool IsPinned() const override {
+    return owner_->floating_close_button_ == nullptr;
+  }
+
+ private:
+  ArcCustomNotificationView* const owner_;

[yoshiki, 2016/12/02 12:15:48]

Please add DISALLOW_COPY_AND_ASSIGN

[yhanada, 2016/12/06 02:48:08]

Done.

+};
+
 ArcCustomNotificationView::ArcCustomNotificationView(
     ArcCustomNotificationItem* item)
     : item_(item),
       notification_key_(item->notification_key()),
       event_forwarder_(new EventForwarder(this)) {
   item_->IncrementWindowRefCount();
   item_->AddObserver(this);
 
   ArcNotificationSurfaceManager::Get()->AddObserver(this);
   exo::NotificationSurface* surface =
@@ skipping 10 matching lines @@
   SetSurface(nullptr);
   if (item_) {
     item_->DecrementWindowRefCount();
     item_->RemoveObserver(this);
   }
 
   if (ArcNotificationSurfaceManager::Get())
     ArcNotificationSurfaceManager::Get()->RemoveObserver(this);
 }
 
+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));
 
@@ skipping 61 matching lines @@
 
   SetPreferredSize(preferred_size);
 }
 
 void ArcCustomNotificationView::UpdateCloseButtonVisiblity() {
   if (!surface_ || !floating_close_button_widget_)
     return;
 
   const bool target_visiblity =
       surface_->window()->GetBoundsInScreen().Contains(
-          display::Screen::GetScreen()->GetCursorScreenPoint());
+          display::Screen::GetScreen()->GetCursorScreenPoint()) ||
+      floating_close_button_->HasFocus();
   if (target_visiblity == floating_close_button_widget_->IsVisible())
     return;
 
   if (target_visiblity)
     floating_close_button_widget_->Show();
   else
     floating_close_button_widget_->Hide();
 }
 
 void ArcCustomNotificationView::UpdatePinnedState() {
@@ skipping 171 matching lines @@
 
 void ArcCustomNotificationView::OnNotificationSurfaceRemoved(
     exo::NotificationSurface* surface) {
   if (surface->notification_id() != notification_key_)
     return;
 
   SetSurface(nullptr);
 }
 
 }  // namespace arc