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

ui/views/controls/focusable_border.cc

Index: ui/views/controls/focusable_border.cc
diff --git a/ui/views/controls/focusable_border.cc b/ui/views/controls/focusable_border.cc
index 2d500a90f9f133f6afca0c239ec1f901b8ec56d7..fbe8cb2a4e479d4a4868405733f7b1c1929d1bb6 100644
--- a/ui/views/controls/focusable_border.cc
+++ b/ui/views/controls/focusable_border.cc
@@ -43,6 +43,10 @@ void FocusableBorder::UseDefaultColor() {
 }
 
 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));