Harmony checkbox/radio tweaks

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/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/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);
     SetInkDropMode(InkDropMode::ON);
     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();
 
     // Unchecked/Unfocused images.
@@ skipping 75 matching lines @@
 }
 
 void Checkbox::OnPaint(gfx::Canvas* canvas) {
   LabelButton::OnPaint(canvas);
 
   if (!UseMd() || !HasFocus())
     return;
 
   SkPaint focus_paint;
   focus_paint.setAntiAlias(true);
-  focus_paint.setColor(GetNativeTheme()->GetSystemColor(
-      ui::NativeTheme::kColorId_FocusedBorderColor));
+  focus_paint.setColor(
+      SkColorSetA(GetNativeTheme()->GetSystemColor(
+                      ui::NativeTheme::kColorId_FocusedBorderColor),
+                  0x66));
   focus_paint.setStyle(SkPaint::kStroke_Style);
-  focus_paint.setStrokeWidth(1);
+  focus_paint.setStrokeWidth(2);
   PaintFocusRing(canvas, focus_paint);
 }
 
 void Checkbox::OnFocus() {
   LabelButton::OnFocus();
   if (!UseMd())
     UpdateImage();
 }
 
 void Checkbox::OnBlur() {
@@ skipping 17 matching lines @@
 }
 
 SkColor Checkbox::GetInkDropBaseColor() const {
   return GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_UnfocusedBorderColor);
 }
 
 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));
+        GetVectorIconId(), 16,
+        // When not checked, the icon color matches the button text color.
+        GetNativeTheme()->GetSystemColor(
+            checked_ ? ui::NativeTheme::kColorId_CallToActionColor
+                     : ui::NativeTheme::kColorId_ButtonEnabledColor));
   }
 
   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];
 }
 
 void Checkbox::SetCustomImage(bool checked,
                               bool focused,
                               ButtonState for_state,
                               const gfx::ImageSkia& image) {
   const size_t checked_index = checked ? 1 : 0;
   const size_t focused_index = focused ? 1 : 0;
   images_[checked_index][focused_index][for_state] = image;
   UpdateImage();
 }
 
 void Checkbox::PaintFocusRing(gfx::Canvas* canvas, const SkPaint& paint) {
   gfx::RectF focus_rect(image()->bounds());
-  focus_rect.Inset(gfx::InsetsF(-.5f));
   canvas->DrawRoundRect(focus_rect, 2.f, paint);
 }
 
+gfx::VectorIconId Checkbox::GetVectorIconId() const {
+  return checked() ? gfx::VectorIconId::CHECKBOX_ACTIVE
+                   : gfx::VectorIconId::CHECKBOX_NORMAL;
+}
+
 void Checkbox::NotifyClick(const ui::Event& event) {
   SetChecked(!checked());
   LabelButton::NotifyClick(event);
 }
 
 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