[ash-md] Added different highlighting modes to the InkDropImpl.

ash/common/shelf/overflow_button.cc

 // Copyright 2013 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 "ash/common/shelf/overflow_button.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/ink_drop_button_listener.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_view.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "base/memory/ptr_util.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
+#include "ui/views/animation/ink_drop_impl.h"
 
 namespace ash {
 
 OverflowButton::OverflowButton(ShelfView* shelf_view, WmShelf* wm_shelf)
     : CustomButton(nullptr),
       bottom_image_(nullptr),
       shelf_view_(shelf_view),
       wm_shelf_(wm_shelf),
       background_alpha_(0) {
   DCHECK(shelf_view_);
@@ skipping 36 matching lines @@
   background_alpha_ = alpha;
   SchedulePaint();
 }
 
 void OverflowButton::OnPaint(gfx::Canvas* canvas) {
   gfx::Rect bounds = CalculateButtonBounds();
   PaintBackground(canvas, bounds);
   PaintForeground(canvas, bounds);
 }
 
+std::unique_ptr<views::InkDrop> OverflowButton::CreateInkDrop() {
+  return CreateDefaultFloodFillInkDropImpl();
+}
+
 std::unique_ptr<views::InkDropRipple> OverflowButton::CreateInkDropRipple()
     const {
   return base::MakeUnique<views::FloodFillInkDropRipple>(
       CalculateButtonBounds(), GetInkDropCenterBasedOnLastEvent(),
       GetInkDropBaseColor(), ink_drop_visible_opacity());
 }
 
 bool OverflowButton::ShouldEnterPushedState(const ui::Event& event) {
   if (shelf_view_->IsShowingOverflowBubble())
     return false;
 
   return CustomButton::ShouldEnterPushedState(event);
 }
 
-bool OverflowButton::ShouldShowInkDropHighlight() const {
-  return false;
-}
-
 void OverflowButton::NotifyClick(const ui::Event& event) {
   CustomButton::NotifyClick(event);
   shelf_view_->ButtonPressed(this, event, GetInkDrop());
 }
 
 void OverflowButton::PaintBackground(gfx::Canvas* canvas,
                                      const gfx::Rect& bounds) {
   if (MaterialDesignController::IsShelfMaterial()) {
     SkPaint background_paint;
     background_paint.setFlags(SkPaint::kAntiAlias_Flag);
@@ skipping 76 matching lines @@
       bounds =
           gfx::Rect(bounds.x() + (bounds.width() - background->width()) / 2,
                     bounds.y() + kShelfItemInset, background->width(),
                     background->height());
     }
   }
   return bounds;
 }
 
 }  // namespace ash