Refactor MdFocusRing to make it easier to reuse on other controls.

ui/views/controls/button/md_text_button.cc

 // Copyright 2015 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/md_text_button.h"
 
 #include "base/i18n/case_conversion.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_painted_layer_delegates.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/blue_button.h"
+#include "ui/views/controls/focus_ring.h"
 #include "ui/views/painter.h"
 #include "ui/views/style/platform_style.h"
 
 namespace views {
 
 namespace {
 
 // Minimum size to reserve for the button contents.
 const int kMinWidth = 48;
 
-// The stroke width of the focus border in dp.
-const int kFocusBorderThickness = 2;
-
-// The corner radius of the focus border roundrect.
-const int kFocusBorderCornerRadius = 3;
-
 LabelButton* CreateButton(ButtonListener* listener,
                           const base::string16& text,
                           bool md) {
   if (md)
     return MdTextButton::Create(listener, text);
 
   LabelButton* button = new LabelButton(listener, text);
   button->SetStyle(CustomButton::STYLE_BUTTON);
   return button;
 }
 
 const gfx::FontList& GetMdFontList() {
   static base::LazyInstance<gfx::FontList>::Leaky font_list =
       LAZY_INSTANCE_INITIALIZER;
   const gfx::Font::Weight min_weight = gfx::Font::Weight::MEDIUM;
   if (font_list.Get().GetFontWeight() < min_weight)
     font_list.Get() = font_list.Get().DeriveWithWeight(min_weight);
   return font_list.Get();
 }
 
 }  // namespace
 
-namespace internal {
-
-class MdFocusRing : public View {
- public:
-  MdFocusRing() {
-    SetPaintToLayer(true);
-    layer()->SetFillsBoundsOpaquely(false);
-  }
-  ~MdFocusRing() override {}
-
-  // View:
-  bool CanProcessEventsWithinSubtree() const override { return false; }
-
-  void OnPaint(gfx::Canvas* canvas) override {
-    SkPaint paint;
-    paint.setAntiAlias(true);
-    paint.setColor(
-        SkColorSetA(GetNativeTheme()->GetSystemColor(
-                        ui::NativeTheme::kColorId_FocusedBorderColor),
-                    0x66));
-    paint.setStyle(SkPaint::kStroke_Style);
-    paint.setStrokeWidth(kFocusBorderThickness);
-    gfx::RectF rect(GetLocalBounds());
-    rect.Inset(gfx::InsetsF(kFocusBorderThickness / 2.f));
-    canvas->DrawRoundRect(rect, kFocusBorderCornerRadius, paint);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MdFocusRing);
-};
-
-}  // namespace internal
-
 // static
 LabelButton* MdTextButton::CreateSecondaryUiButton(ButtonListener* listener,
                                                    const base::string16& text) {
   return CreateButton(listener, text,
                       ui::MaterialDesignController::IsSecondaryUiMaterial());
 }
 
 // static
 LabelButton* MdTextButton::CreateSecondaryUiBlueButton(
     ButtonListener* listener,
@@ skipping 17 matching lines @@
 }
 
 void MdTextButton::SetProminent(bool is_prominent) {
   if (is_prominent_ == is_prominent)
     return;
 
   is_prominent_ = is_prominent;
   UpdateColors();
 }
 
-void MdTextButton::Layout() {
-  LabelButton::Layout();
-  gfx::Rect focus_bounds = GetLocalBounds();
-  focus_bounds.Inset(gfx::Insets(-kFocusBorderThickness));
-  focus_ring_->SetBoundsRect(focus_bounds);
-}
-
 void MdTextButton::OnFocus() {
   LabelButton::OnFocus();
   focus_ring_->SetVisible(true);
 }
 
 void MdTextButton::OnBlur() {
   LabelButton::OnBlur();
   focus_ring_->SetVisible(false);
 }
 
@@ skipping 68 matching lines @@
   UpdateColors();
 }
 
 void MdTextButton::SetFontList(const gfx::FontList& font_list) {
   NOTREACHED()
       << "Don't call MdTextButton::SetFontList (it will soon be protected)";
 }
 
 MdTextButton::MdTextButton(ButtonListener* listener)
     : LabelButton(listener, base::string16()),
-      focus_ring_(new internal::MdFocusRing()),
+      focus_ring_(new FocusRing()),
       is_prominent_(false) {
   SetInkDropMode(PlatformStyle::kUseRipples ? InkDropMode::ON
                                             : InkDropMode::OFF);
   set_has_ink_drop_action_on_click(true);
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
   SetFocusForPlatform();
   SetMinSize(gfx::Size(kMinWidth, 0));
   SetFocusPainter(nullptr);
   label()->SetAutoColorReadabilityEnabled(false);
   AddChildView(focus_ring_);
@@ skipping 84 matching lines @@
                              ? SkColorSetA(SK_ColorBLACK, kStrokeOpacity)
                              : SkColorSetA(SK_ColorWHITE, 2 * kStrokeOpacity);
 
   DCHECK_EQ(SK_AlphaOPAQUE, static_cast<int>(SkColorGetA(bg_color)));
   set_background(Background::CreateBackgroundPainter(
       true, Painter::CreateRoundRectWith1PxBorderPainter(
                 bg_color, stroke_color, kInkDropSmallCornerRadius)));
 }
 
 }  // namespace views