Add ripples to md checkboxes/radio buttons

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_view_state.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/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
+#include "ui/views/animation/button_ink_drop_delegate.h"
+#include "ui/views/animation/ink_drop_hover.h"
+#include "ui/views/animation/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"
 
 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);
+    set_ink_drop_delegate(
+        base::WrapUnique(new ButtonInkDropDelegate(this, this)));
+    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));
   } 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();
 
     // Unchecked/Unfocused images.
@@ skipping 100 matching lines @@
   if (!UseMd())
     UpdateImage();
 }
 
 void Checkbox::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   LabelButton::OnNativeThemeChanged(theme);
   if (UseMd())
     UpdateImage();
 }
 
+std::unique_ptr<InkDropRipple> Checkbox::CreateInkDropRipple() const {
+  // Skip over the LabelButton override.
+  return InkDropHostView::CreateInkDropRipple();
+}
+
+std::unique_ptr<InkDropHover> Checkbox::CreateInkDropHover() const {
+  return nullptr;
+}
+
+gfx::Point Checkbox::GetInkDropCenter() const {
+  return image()->bounds().CenterPoint();
+}
+
+SkColor Checkbox::GetInkDropBaseColor() const {
+  return GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_UnfocusedBorderColor);

[sky, 2016/06/02 03:13:30]

This seems like a weird choice for a base color. I'm assuming you know what
you're doing.

[Evan Stade, 2016/06/02 19:40:18]

How so? It's the color of the checkbox square/radio circle. In other places like
the bookmark bar folder buttons we use the color of the icon, so this seems like
the most natural choice.
I hope you're right.

[sky, 2016/06/02 21:47:59]

I didn't realize we use 'unfocused border color' in those places. IMO 'unfocused
border color' isn't a descriptive name for a color used as a base in many
places. But I realize naming is hard.

+}
+
 gfx::ImageSkia Checkbox::GetImage(ButtonState for_state) const {
   if (UseMd()) {
     return gfx::CreateVectorIcon(
         checked_ ? gfx::VectorIconId::CHECKBOX_ACTIVE
                  : gfx::VectorIconId::CHECKBOX_NORMAL,
         16, GetNativeTheme()->GetSystemColor(
                 checked_ ? ui::NativeTheme::kColorId_FocusedBorderColor
                          : ui::NativeTheme::kColorId_UnfocusedBorderColor));
   }
 
@@ skipping 29 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