Remove ripple effect from notification header.

This CL removes ripple effect from notification header for the sake of
consistency with Android notifications.

Originally, this feature was added in
* http://crrev.com/2959363002
* http://crrev.com/c/603033

TEST=manual
BUG=767246

Change-Id: I80e7772fb535f3050263d57f4d11f8d6d81eec27
Reviewed-on: https://chromium-review.googlesource.com/676963Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org>
Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#503634}

ui/message_center/views/notification_header_view.cc

@@ -18,9 +18,6 @@
 #include "ui/message_center/vector_icons.h"
 #include "ui/message_center/views/notification_control_buttons_view.h"
 #include "ui/strings/grit/ui_strings.h"
-#include "ui/views/animation/flood_fill_ink_drop_ripple.h"
-#include "ui/views/animation/ink_drop_highlight.h"
-#include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
@@ -64,13 +61,6 @@ constexpr gfx::Insets kExpandIconViewPadding(13, 0, 9, 0);
 // Bullet character. The divider symbol between different parts of the header.
 constexpr wchar_t kNotificationHeaderDivider[] = L" \u2022 ";
 
-// 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;
-
 // base::TimeBase has similar constants, but some of them are missing.
 constexpr int64_t kMinuteInMillis = 60LL * 1000LL;
 constexpr int64_t kHourInMillis = 60LL * kMinuteInMillis;
@@ -172,13 +162,6 @@ NotificationHeaderView::NotificationHeaderView(
     : views::Button(listener) {
   const int kInnerHeaderHeight = kHeaderHeight - kHeaderOuterPadding.height();
 
-  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);
-
   views::BoxLayout* layout =
       new views::BoxLayout(views::BoxLayout::kHorizontal, kHeaderOuterPadding,
                            kHeaderHorizontalSpacing);
@@ -186,12 +169,6 @@ NotificationHeaderView::NotificationHeaderView(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
   SetLayoutManager(layout);
 
-  ink_drop_container_ = new views::InkDropContainerView();
-  ink_drop_container_->SetPaintToLayer();
-  ink_drop_container_->layer()->SetFillsBoundsOpaquely(false);
-  ink_drop_container_->SetVisible(false);
-  AddChildView(ink_drop_container_);
-
   views::View* app_info_container = new views::View();
   views::BoxLayout* app_info_layout = new views::BoxLayout(
       views::BoxLayout::kHorizontal, kHeaderPadding, kHeaderHorizontalSpacing);
@@ -366,40 +343,6 @@ bool NotificationHeaderView::IsExpandButtonEnabled() {
   return expand_button_->visible();
 }
 
-std::unique_ptr<views::InkDrop> NotificationHeaderView::CreateInkDrop() {
-  auto ink_drop = std::make_unique<views::InkDropImpl>(this, size());
-  ink_drop->SetAutoHighlightMode(
-      views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE);
-  ink_drop->SetShowHighlightOnHover(false);
-  return ink_drop;
-}
-
-std::unique_ptr<views::InkDropRipple>
-NotificationHeaderView::CreateInkDropRipple() const {
-  return std::make_unique<views::FloodFillInkDropRipple>(
-      size(), GetInkDropCenterBasedOnLastEvent(), GetInkDropBaseColor(),
-      ink_drop_visible_opacity());
-}
-
-std::unique_ptr<views::InkDropHighlight>
-NotificationHeaderView::CreateInkDropHighlight() const {
-  auto highlight = std::make_unique<views::InkDropHighlight>(
-      size(), kInkDropSmallCornerRadius,
-      gfx::RectF(GetLocalBounds()).CenterPoint(), GetInkDropBaseColor());
-  highlight->set_visible_opacity(kInkDropHighlightVisibleOpacity);
-  return highlight;
-}
-
-void NotificationHeaderView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
-  ink_drop_container_->AddInkDropLayer(ink_drop_layer);
-  InstallInkDropMask(ink_drop_layer);
-}
-
-void NotificationHeaderView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
-  ResetInkDropMask();
-  ink_drop_container_->RemoveInkDropLayer(ink_drop_layer);
-}
-
 void NotificationHeaderView::UpdateSummaryTextVisibility() {
   const bool visible = has_progress_ || has_overflow_indicator_;
   summary_text_divider_->SetVisible(visible);

ui/message_center/views/notification_header_view.h

@@ -41,14 +41,6 @@ class NotificationHeaderView : public views::Button {
   void ClearTimestamp();
   bool IsExpandButtonEnabled();
 
-  // Button override:
-  std::unique_ptr<views::InkDrop> CreateInkDrop() override;
-  std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
-  std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
-      const override;
-  void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
-  void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override;
-
   views::ImageView* expand_button() { return expand_button_; }
 
   SkColor accent_color_for_testing() { return accent_color_; }
@@ -59,7 +51,6 @@ class NotificationHeaderView : public views::Button {
 
   SkColor accent_color_ = message_center::kNotificationDefaultAccentColor;
 
-  views::InkDropContainerView* ink_drop_container_ = nullptr;
   views::Label* app_name_view_ = nullptr;
   views::Label* summary_text_divider_ = nullptr;
   views::Label* summary_text_view_ = nullptr;