Add ripple effect to action in expand button.

ui/message_center/views/notification_header_view.cc

 // Copyright 2017 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/message_center/views/notification_header_view.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_palette.h"
@@ skipping 25 matching lines @@
 // Bullet character. The divider symbol between different parts of the header.
 constexpr base::char16 kNotificationHeaderDividerSymbol = 0x2022;
 
 // Base ink drop color of action buttons.
 const SkColor kInkDropBaseColor = SkColorSetRGB(0x0, 0x0, 0x0);
 // Ripple ink drop opacity of action buttons.
 constexpr float kInkDropRippleVisibleOpacity = 0.08f;
 // Highlight (hover) ink drop opacity of action buttons.
 constexpr float kInkDropHighlightVisibleOpacity = 0.08f;
 
+// ExpandButtton forwards all mouse and key events to NotificationHeaderView,
+// but takes tab focus for accessibility purpose.
+class ExpandButton : public views::ImageView {
+ public:
+  ExpandButton();
+  ~ExpandButton() override;
+
+  void OnPaint(gfx::Canvas* canvas) override;
+  void OnFocus() override;
+  void OnBlur() override;
+
+ private:
+  std::unique_ptr<views::Painter> focus_painter_;
+};
+
+ExpandButton::ExpandButton() {
+  SetImage(gfx::CreateVectorIcon(kNotificationExpandMoreIcon, kExpandIconSize,
+                                 gfx::kChromeIconGrey));
+  focus_painter_ = views::Painter::CreateSolidFocusPainter(
+      kFocusBorderColor, gfx::Insets(1, 2, 2, 2));
+  SetFocusBehavior(FocusBehavior::ALWAYS);
+}
+
+ExpandButton::~ExpandButton() = default;
+
+void ExpandButton::OnPaint(gfx::Canvas* canvas) {
+  views::ImageView::OnPaint(canvas);
+  views::Painter::PaintFocusPainter(this, canvas, focus_painter_.get());
+}
+
+void ExpandButton::OnFocus() {
+  views::ImageView::OnFocus();
+  SchedulePaint();
+}
+
+void ExpandButton::OnBlur() {
+  views::ImageView::OnBlur();
+  SchedulePaint();
+}
+
 }  // namespace
 
 NotificationHeaderView::NotificationHeaderView(views::ButtonListener* listener)
     : views::CustomButton(listener) {
   SetInkDropMode(InkDropMode::ON);
   set_has_ink_drop_action_on_click(true);
   set_animate_on_state_change(true);
   set_notify_enter_exit_on_child(true);
   set_ink_drop_base_color(kInkDropBaseColor);
   set_ink_drop_visible_opacity(kInkDropRippleVisibleOpacity);
@@ skipping 38 matching lines @@
   app_info_container->AddChildView(summary_text_divider_);
 
   // Summary text view
   summary_text_view_ = new views::Label(base::string16());
   summary_text_view_->SetFontList(font_list);
   summary_text_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   summary_text_view_->SetVisible(false);
   app_info_container->AddChildView(summary_text_view_);
 
   // Expand button view
-  expand_button_ = new views::ImageButton(listener);
-  expand_button_->SetImage(
-      views::Button::STATE_NORMAL,
-      gfx::CreateVectorIcon(kNotificationExpandMoreIcon, kExpandIconSize,
-                            gfx::kChromeIconGrey));
-  expand_button_->SetFocusForPlatform();
-  expand_button_->SetFocusPainter(views::Painter::CreateSolidFocusPainter(
-      kFocusBorderColor, gfx::Insets(1, 2, 2, 2)));
+  expand_button_ = new ExpandButton();
   app_info_container->AddChildView(expand_button_);
 
   // Spacer between left-aligned views and right-aligned views
   views::View* spacer = new views::View;
   spacer->SetPreferredSize(gfx::Size(1, kHeaderHeight));
   AddChildView(spacer);
   layout->SetFlexForView(spacer, 1);
 
   // Settings button view
   settings_button_ = new PaddedButton(listener);
@@ skipping 44 matching lines @@
   }
   UpdateSummaryTextVisibility();
 }
 
 void NotificationHeaderView::ClearOverflowIndicator() {
   has_overflow_indicator_ = false;
   UpdateSummaryTextVisibility();
 }
 
 void NotificationHeaderView::SetExpandButtonEnabled(bool enabled) {
+  // SetInkDropMode iff. the visibility changed.
+  // Otherwise, the ink drop animation cannot finish.
+  if (expand_button_->visible() != enabled)
+    SetInkDropMode(enabled ? InkDropMode::ON : InkDropMode::OFF);
+
   expand_button_->SetVisible(enabled);
 }
 
 void NotificationHeaderView::SetExpanded(bool expanded) {
   expand_button_->SetImage(
-      views::Button::STATE_NORMAL,
       gfx::CreateVectorIcon(
           expanded ? kNotificationExpandLessIcon : kNotificationExpandMoreIcon,
           kExpandIconSize, gfx::kChromeIconGrey));
 }
 
 void NotificationHeaderView::SetSettingsButtonEnabled(bool enabled) {
   if (settings_button_enabled_ != enabled) {
     settings_button_enabled_ = enabled;
     UpdateControlButtonsVisibility();
   }
@@ skipping 58 matching lines @@
 }
 
 void NotificationHeaderView::UpdateSummaryTextVisibility() {
   const bool visible = has_progress_ || has_overflow_indicator_;
   summary_text_divider_->SetVisible(visible);
   summary_text_view_->SetVisible(visible);
   Layout();
 }
 
 }  // namespace message_center