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

ui/views/controls/button/md_text_button.cc

 // Copyright 2015 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/views/controls/button/md_text_button.h"
 
 #include "base/i18n/case_conversion.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme.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/animation/ink_drop_painted_layer_delegates.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/focus_ring.h"
 #include "ui/views/painter.h"
 #include "ui/views/style/platform_style.h"
 
 namespace views {
 
@@ skipping 89 matching lines @@
 
 void MdTextButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   LabelButton::OnNativeThemeChanged(theme);
   UpdateColors();
 }
 
 SkColor MdTextButton::GetInkDropBaseColor() const {
   return color_utils::DeriveDefaultIconColor(label()->enabled_color());
 }
 
+std::unique_ptr<InkDrop> MdTextButton::CreateInkDrop() {
+  return CreateDefaultFloodFillInkDropImpl();
+}
+
 std::unique_ptr<views::InkDropRipple> MdTextButton::CreateInkDropRipple()
     const {
   return std::unique_ptr<views::InkDropRipple>(
       new views::FloodFillInkDropRipple(
           GetLocalBounds(), GetInkDropCenterBasedOnLastEvent(),
           GetInkDropBaseColor(), ink_drop_visible_opacity()));
 }
 
 void MdTextButton::StateChanged() {
   LabelButton::StateChanged();
   UpdateColors();
 }
 
 std::unique_ptr<views::InkDropHighlight> MdTextButton::CreateInkDropHighlight()
     const {
-  if (!ShouldShowInkDropHighlight())
-    return nullptr;
-
   // The prominent button hover effect is a shadow.
   const int kYOffset = 1;
   const int kSkiaBlurRadius = 2;
   const int shadow_alpha = is_prominent_ ? 0x3D : 0x1A;
   std::vector<gfx::ShadowValue> shadows;
   // The notion of blur that gfx::ShadowValue uses is twice the Skia/CSS value.
   // Skia counts the number of pixels outside the mask area whereas
   // gfx::ShadowValue counts together the number of pixels inside and outside
   // the mask bounds.
   shadows.push_back(gfx::ShadowValue(gfx::Vector2d(0, kYOffset),
                                      2 * kSkiaBlurRadius,
                                      SkColorSetA(SK_ColorBLACK, shadow_alpha)));
   const SkColor fill_color =
       SkColorSetA(SK_ColorWHITE, is_prominent_ ? 0x0D : 0x05);
   return base::MakeUnique<InkDropHighlight>(
       gfx::RectF(GetLocalBounds()).CenterPoint(),
       base::WrapUnique(new BorderShadowLayerDelegate(
           shadows, GetLocalBounds(), fill_color, kInkDropSmallCornerRadius)));
 }
 
-bool MdTextButton::ShouldShowInkDropForFocus() const {
-  // These types of button use FocusRing.
-  return false;
-}
-
 void MdTextButton::SetEnabledTextColors(SkColor color) {
   LabelButton::SetEnabledTextColors(color);
   UpdateColors();
 }
 
 void MdTextButton::SetText(const base::string16& text) {
   LabelButton::SetText(text);
   UpdatePadding();
 }
 
@@ skipping 119 matching lines @@
         stroke_color, gfx::kDisabledControlAlpha);
   }
 
   DCHECK_EQ(SK_AlphaOPAQUE, static_cast<int>(SkColorGetA(bg_color)));
   set_background(Background::CreateBackgroundPainter(
       true, Painter::CreateRoundRectWith1PxBorderPainter(
                 bg_color, stroke_color, kInkDropSmallCornerRadius)));
 }
 
 }  // namespace views