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

ui/views/controls/button/checkbox.cc

 // Copyright (c) 2012 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/checkbox.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
-#include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_ripple.h"
+#include "ui/views/animation/square_ink_drop_ripple.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/painter.h"
 #include "ui/views/resources/grit/views_resources.h"
 #include "ui/views/style/platform_style.h"
 
 namespace views {
 
 // static
 const char Checkbox::kViewClassName[] = "Checkbox";
 
 Checkbox::Checkbox(const base::string16& label)
     : LabelButton(NULL, label),
       checked_(false) {
   SetHorizontalAlignment(gfx::ALIGN_LEFT);
   SetFocusForPlatform();
 
   if (UseMd()) {
     set_request_focus_on_press(false);
     SetInkDropMode(PlatformStyle::kUseRipples ? InkDropMode::ON
                                               : InkDropMode::OFF);
     set_has_ink_drop_action_on_click(true);
-    // The "small" size is 21dp, the large size is 1.33 * 21dp = 28dp.
-    set_ink_drop_size(gfx::Size(21, 21));
     SetFocusPainter(nullptr);
   } else {
     std::unique_ptr<LabelButtonBorder> button_border(new LabelButtonBorder());
     // Inset the trailing side by a couple pixels for the focus border.
     button_border->set_insets(gfx::Insets(0, 0, 0, 2));
     SetBorder(std::move(button_border));
     set_request_focus_on_press(true);
 
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
@@ skipping 104 matching lines @@
     UpdateImage();
 }
 
 void Checkbox::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   LabelButton::OnNativeThemeChanged(theme);
   if (UseMd())
     UpdateImage();
 }
 
 std::unique_ptr<InkDropRipple> Checkbox::CreateInkDropRipple() const {
-  return CreateDefaultInkDropRipple(image()->GetMirroredBounds().CenterPoint());
-}
-
-std::unique_ptr<InkDropHighlight> Checkbox::CreateInkDropHighlight() const {
-  return nullptr;
+  // The "small" size is 21dp, the large size is 1.33 * 21dp = 28dp.
+  const gfx::Size size(21, 21);
+  std::unique_ptr<InkDropRipple> ripple(new SquareInkDropRipple(
+      CalculateLargeInkDropSize(size), kInkDropLargeCornerRadius, size,
+      kInkDropSmallCornerRadius, image()->GetMirroredBounds().CenterPoint(),
+      GetInkDropBaseColor(), ink_drop_visible_opacity()));
+  return ripple;
 }
 
 SkColor Checkbox::GetInkDropBaseColor() const {
   return GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_ButtonEnabledColor);
 }
 
 gfx::ImageSkia Checkbox::GetImage(ButtonState for_state) const {
   if (UseMd()) {
     return gfx::CreateVectorIcon(
@@ skipping 40 matching lines @@
 ui::NativeTheme::Part Checkbox::GetThemePart() const {
   return ui::NativeTheme::kCheckbox;
 }
 
 void Checkbox::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
   LabelButton::GetExtraParams(params);
   params->button.checked = checked_;
 }
 
 }  // namespace views