Harmony checkbox/radio tweaks

ui/views/controls/button/radio_button.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/radio_button.h"
 
 #include "base/logging.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event_utils.h"
@@ skipping 49 matching lines @@
     SetCustomImage(true, true, STATE_HOVERED,
                    *rb.GetImageSkiaNamed(IDR_RADIO_FOCUSED_CHECKED_HOVER));
     SetCustomImage(true, true, STATE_PRESSED,
                    *rb.GetImageSkiaNamed(IDR_RADIO_FOCUSED_CHECKED_PRESSED));
   }
 }
 
 RadioButton::~RadioButton() {
 }
 
-void RadioButton::SetChecked(bool checked) {
-  if (checked == RadioButton::checked())
-    return;
-  if (checked) {
-    // We can't just get the root view here because sometimes the radio
-    // button isn't attached to a root view (e.g., if it's part of a tab page
-    // that is currently not active).
-    View* container = parent();
-    while (container && container->parent())
-      container = container->parent();
-    if (container) {
-      Views other;
-      container->GetViewsInGroup(GetGroup(), &other);
-      for (Views::iterator i(other.begin()); i != other.end(); ++i) {
-        if (*i != this) {
-          if (strcmp((*i)->GetClassName(), kViewClassName)) {
-            NOTREACHED() << "radio-button-nt has same group as other non "
-                            "radio-button-nt views.";
-            continue;
-          }
-          RadioButton* peer = static_cast<RadioButton*>(*i);
-          peer->SetChecked(false);
-        }
-      }
-    }
-  }
-  Checkbox::SetChecked(checked);
-}
-
-void RadioButton::PaintFocusRing(gfx::Canvas* canvas, const SkPaint& paint) {
-  canvas->DrawCircle(gfx::PointF(image()->bounds().CenterPoint()),
-                     image()->width() / 2 + .5f, paint);
-}
-
 const char* RadioButton::GetClassName() const {
   return kViewClassName;
 }
 
 void RadioButton::GetAccessibleState(ui::AXViewState* state) {
   Checkbox::GetAccessibleState(state);
   state->role = ui::AX_ROLE_RADIO_BUTTON;
 }
 
 View* RadioButton::GetSelectedViewForGroup(int group) {
@@ skipping 31 matching lines @@
   if (!checked())
     SetChecked(true);
   RequestFocus();
   LabelButton::NotifyClick(event);
 }
 
 ui::NativeTheme::Part RadioButton::GetThemePart() const {
   return ui::NativeTheme::kRadio;
 }
 
-gfx::ImageSkia RadioButton::GetImage(ButtonState for_state) const {
-  if (!UseMd())
-    return Checkbox::GetImage(for_state);
+void RadioButton::SetChecked(bool checked) {
+  if (checked == RadioButton::checked())
+    return;
+  if (checked) {
+    // We can't just get the root view here because sometimes the radio
+    // button isn't attached to a root view (e.g., if it's part of a tab page
+    // that is currently not active).
+    View* container = parent();
+    while (container && container->parent())
+      container = container->parent();
+    if (container) {
+      Views other;
+      container->GetViewsInGroup(GetGroup(), &other);
+      for (Views::iterator i(other.begin()); i != other.end(); ++i) {
+        if (*i != this) {
+          if (strcmp((*i)->GetClassName(), kViewClassName)) {
+            NOTREACHED() << "radio-button-nt has same group as other non "
+                            "radio-button-nt views.";
+            continue;
+          }
+          RadioButton* peer = static_cast<RadioButton*>(*i);
+          peer->SetChecked(false);
+        }
+      }
+    }
+  }
+  Checkbox::SetChecked(checked);
+}
 
-  return gfx::CreateVectorIcon(
-      checked() ? gfx::VectorIconId::RADIO_BUTTON_ACTIVE
-                : gfx::VectorIconId::RADIO_BUTTON_NORMAL,
-      16, GetNativeTheme()->GetSystemColor(
-              checked() ? ui::NativeTheme::kColorId_FocusedBorderColor
-                        : ui::NativeTheme::kColorId_UnfocusedBorderColor));
+void RadioButton::PaintFocusRing(gfx::Canvas* canvas, const SkPaint& paint) {
+  canvas->DrawCircle(gfx::RectF(image()->bounds()).CenterPoint(),
+                     image()->width() / 2, paint);
+}
+
+gfx::VectorIconId RadioButton::GetVectorIconId() const {
+  return checked() ? gfx::VectorIconId::RADIO_BUTTON_ACTIVE
+                   : gfx::VectorIconId::RADIO_BUTTON_NORMAL;
 }
 
 }  // namespace views