Harmony - update button focus rings.

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_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/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 normal and call to action mode.
-const int kFocusBorderThickness = 1;
-const int kFocusBorderThicknessCta = 2;
+// 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::CreateMdButton(listener, text);
 
@@ skipping 10 matching lines @@
     font_list.Get() = font_list.Get().DeriveWithWeight(min_weight);
   return font_list.Get();
 }
 
 }  // namespace
 
 namespace internal {
 
 class MdFocusRing : public View {
  public:
-  MdFocusRing() : thickness_(kFocusBorderThickness) {
+  MdFocusRing() {
     SetPaintToLayer(true);
     layer()->SetFillsBoundsOpaquely(false);
   }
   ~MdFocusRing() override {}
 
-  int thickness() const { return thickness_; }
-  void set_thickness(int thickness) { thickness_ = thickness; }
-
   // View:
   bool CanProcessEventsWithinSubtree() const override { return false; }
 
   void OnPaint(gfx::Canvas* canvas) override {
-    MdTextButton::PaintMdFocusRing(canvas, this, thickness_, 0x33);
+    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:
-  int thickness_;
-
   DISALLOW_COPY_AND_ASSIGN(MdFocusRing);
 };
 
 }  // namespace internal
 
 // static
 LabelButton* MdTextButton::CreateStandardButton(ButtonListener* listener,
                                                 const base::string16& text) {
   return CreateButton(listener, text,
                       ui::MaterialDesignController::IsModeMaterial());
@@ skipping 21 matching lines @@
 
 // static
 MdTextButton* MdTextButton::CreateMdButton(ButtonListener* listener,
                                            const base::string16& text) {
   MdTextButton* button = new MdTextButton(listener);
   button->SetText(text);
   button->SetFocusForPlatform();
   return button;
 }
 
-// static
-void MdTextButton::PaintMdFocusRing(gfx::Canvas* canvas,
-                                    views::View* view,
-                                    int thickness,
-                                    SkAlpha alpha) {
-  SkPaint paint;
-  paint.setAntiAlias(true);
-  paint.setColor(SkColorSetA(view->GetNativeTheme()->GetSystemColor(
-                                 ui::NativeTheme::kColorId_CallToActionColor),
-                             alpha));
-  paint.setStyle(SkPaint::kStroke_Style);
-  paint.setStrokeWidth(thickness);
-  gfx::RectF rect(view->GetLocalBounds());
-  rect.Inset(gfx::InsetsF(thickness / 2.f));
-  canvas->DrawRoundRect(rect, kFocusBorderCornerRadius, paint);
-}
-
 void MdTextButton::SetCallToAction(bool cta) {
   if (is_cta_ == cta)
     return;
 
   is_cta_ = cta;
-  focus_ring_->set_thickness(cta ? kFocusBorderThicknessCta
-                                 : kFocusBorderThickness);
   UpdateColors();
 }
 
 void MdTextButton::Layout() {
   LabelButton::Layout();
   gfx::Rect focus_bounds = GetLocalBounds();
-  focus_bounds.Inset(gfx::Insets(-focus_ring_->thickness()));
+  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();
@@ skipping 157 matching lines @@
   SkColor stroke_color = (is_cta_ || color_utils::IsDark(text_color))
                              ? SkColorSetA(SK_ColorBLACK, kStrokeOpacity)
                              : SkColorSetA(SK_ColorWHITE, 2 * kStrokeOpacity);
 
   set_background(Background::CreateBackgroundPainter(
       true, Painter::CreateRoundRectWith1PxBorderPainter(
                 bg_color, stroke_color, kInkDropSmallCornerRadius)));
 }
 
 }  // namespace views