Use kColorId_LabelEnabledColor in Checkbox, not kColorId_ButtonEnabledColor

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/views/animation/ink_drop_impl.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"
 #include "ui/views/vector_icons.h"
 
 namespace views {
 
 // static
 const char Checkbox::kViewClassName[] = "Checkbox";
@@ skipping 109 matching lines @@
 void Checkbox::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   LabelButton::OnNativeThemeChanged(theme);
   if (UseMd())
     UpdateImage();
 }
 
 std::unique_ptr<InkDrop> Checkbox::CreateInkDrop() {
   // Completely removes the highlight.
   std::unique_ptr<InkDropImpl> ink_drop = CreateDefaultInkDropImpl();
   ink_drop->SetShowHighlightOnHover(false);
-  ink_drop->SetAutoHighlightMode(views::InkDropImpl::AutoHighlightMode::NONE);
+  ink_drop->SetAutoHighlightMode(InkDropImpl::AutoHighlightMode::NONE);
   return ink_drop;
 }
 
 std::unique_ptr<InkDropRipple> Checkbox::CreateInkDropRipple() const {
   // 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;
+  return CreateDefaultInkDropRipple(image()->GetMirroredBounds().CenterPoint(),

[tapted, 2017/06/29 10:20:05]

This is
https://cs.chromium.org/chromium/src/ui/views/animation/ink_drop_host_view.cc...

std::unique_ptr<InkDropRipple> InkDropHostView::CreateDefaultInkDropRipple(
    const gfx::Point& center_point,
    const gfx::Size& size) const {
  std::unique_ptr<InkDropRipple> ripple(new SquareInkDropRipple(
      CalculateLargeInkDropSize(size), kInkDropLargeCornerRadius, size,
      kInkDropSmallCornerRadius, center_point, GetInkDropBaseColor(),
      ink_drop_visible_opacity()));
  return ripple;
}

+                                    gfx::Size(21, 21));
 }
 
 SkColor Checkbox::GetInkDropBaseColor() const {
   return GetNativeTheme()->GetSystemColor(
-      ui::NativeTheme::kColorId_ButtonEnabledColor);
+      ui::NativeTheme::kColorId_LabelEnabledColor);
 }
 
 void Checkbox::PaintButtonContents(gfx::Canvas* canvas) {
   if (!UseMd() || !HasFocus())
     return;
 
   cc::PaintFlags focus_flags;
   focus_flags.setAntiAlias(true);
   focus_flags.setColor(
       SkColorSetA(GetNativeTheme()->GetSystemColor(
                       ui::NativeTheme::kColorId_FocusedBorderColor),
                   0x66));
   focus_flags.setStyle(cc::PaintFlags::kStroke_Style);
   focus_flags.setStrokeWidth(2);
   PaintFocusRing(canvas, focus_flags);
 }
 
 gfx::ImageSkia Checkbox::GetImage(ButtonState for_state) const {
   if (UseMd()) {
     return gfx::CreateVectorIcon(
         GetVectorIcon(), 16,
         // When not checked, the icon color matches the button text color.
         GetNativeTheme()->GetSystemColor(
             checked_ ? ui::NativeTheme::kColorId_FocusedBorderColor
-                     : ui::NativeTheme::kColorId_ButtonEnabledColor));
+                     : ui::NativeTheme::kColorId_LabelEnabledColor));
   }
 
   const size_t checked_index = checked_ ? 1 : 0;
   const size_t focused_index = HasFocus() ? 1 : 0;
   if (for_state != STATE_NORMAL &&
       images_[checked_index][focused_index][for_state].isNull())
     return images_[checked_index][focused_index][STATE_NORMAL];
   return images_[checked_index][focused_index][for_state];
 }
 
@@ skipping 25 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