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

ui/views/controls/focusable_border.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/focusable_border.h"
 
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
@@ skipping 25 matching lines @@
 void FocusableBorder::SetColor(SkColor color) {
   override_color_ = color;
   use_default_color_ = false;
 }
 
 void FocusableBorder::UseDefaultColor() {
   use_default_color_ = true;
 }
 
 void FocusableBorder::Paint(const View& view, gfx::Canvas* canvas) {
+  // In harmony, the focus indicator is a FocusRing.
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial() && view.HasFocus())
+    return;
+
   SkPaint paint;
   paint.setStyle(SkPaint::kStroke_Style);
   paint.setColor(GetCurrentColor(view));
 
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     gfx::ScopedCanvas scoped(canvas);
     float dsf = canvas->UndoDeviceScaleFactor();
     // Scale the rect and snap to pixel boundaries.
     gfx::RectF rect(gfx::ScaleToEnclosingRect(view.GetLocalBounds(), dsf));
     rect.Inset(gfx::InsetsF(0.5f));
@@ skipping 36 matching lines @@
   if (ui::MaterialDesignController::IsSecondaryUiMaterial() &&
       !view.enabled()) {
     return color_utils::BlendTowardOppositeLuma(color,
                                                 gfx::kDisabledControlAlpha);
   }
 
   return color;
 }
 
 }  // namespace views