Remove dashed focus rect from Views checkboxes.

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>
 
@@ skipping 15 matching lines @@
 namespace views {
 
 // static
 const char Checkbox::kViewClassName[] = "Checkbox";
 
 Checkbox::Checkbox(const base::string16& label)
     : LabelButton(NULL, label),
       checked_(false) {
   SetHorizontalAlignment(gfx::ALIGN_LEFT);
   SetFocusForPlatform();
+  SetFocusPainter(nullptr);
 
   if (UseMd()) {
     set_request_focus_on_press(false);
     SetInkDropMode(PlatformStyle::kUseRipples ? InkDropMode::ON
                                               : InkDropMode::OFF);
     set_has_ink_drop_action_on_click(true);
-    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 44 matching lines @@
 void Checkbox::SetChecked(bool checked) {
   checked_ = checked;
   UpdateImage();
 }
 
 // static
 bool Checkbox::UseMd() {
   return ui::MaterialDesignController::IsSecondaryUiMaterial();
 }
 
-void Checkbox::Layout() {
-  LabelButton::Layout();
-
-  if (!UseMd()) {
-    // Construct a focus painter that only surrounds the label area.
-    gfx::Rect rect = label()->GetMirroredBounds();
-    rect.Inset(-2, 3);
-    SetFocusPainter(Painter::CreateDashedFocusPainterWithInsets(gfx::Insets(
-        rect.y(), rect.x(), height() - rect.bottom(), width() - rect.right())));
-  }
-}
-
 const char* Checkbox::GetClassName() const {
   return kViewClassName;
 }
 
 void Checkbox::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   LabelButton::GetAccessibleNodeData(node_data);
   node_data->role = ui::AX_ROLE_CHECK_BOX;
   if (checked())
     node_data->AddStateFlag(ui::AX_STATE_CHECKED);
   if (enabled()) {
@@ skipping 103 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