Harmony - Don't paint focus ring on unless border requests it.

ui/views/controls/textfield/textfield.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/textfield/textfield.h"
 
 #include <string>
 #include <utility>
 
 #include "base/trace_event/trace_event.h"
@@ skipping 965 matching lines @@
 void Textfield::OnPaint(gfx::Canvas* canvas) {
   OnPaintBackground(canvas);
   PaintTextAndCursor(canvas);
   OnPaintBorder(canvas);
 }
 
 void Textfield::OnFocus() {
   GetRenderText()->set_focused(true);
   if (ShouldShowCursor())
     GetRenderText()->set_cursor_visible(true);
-  SchedulePaint();
   if (GetInputMethod())
     GetInputMethod()->SetFocusedTextInputClient(this);
   OnCaretBoundsChanged();
   if (ShouldBlinkCursor())
     StartBlinkingCursor();
+  // Pre Harmony, the border typically draws focus indicator. If there's no
+  // border, there should be no focus indicator (e.g. in the omnibox).
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial() &&
+      border() && border()->ShouldAddFocusRing()) {
+    FocusRing::Install(this);
+  }
+  SchedulePaint();
   View::OnFocus();
-  SchedulePaint();
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
-    FocusRing::Install(this);
 }
 
 void Textfield::OnBlur() {
   gfx::RenderText* render_text = GetRenderText();
   render_text->set_focused(false);
   if (GetInputMethod())
     GetInputMethod()->DetachTextInputClient(this);
   StopBlinkingCursor();
   if (render_text->cursor_visible()) {
     render_text->set_cursor_visible(false);
     RepaintCursor();
   }
 
   DestroyTouchSelection();
 
-  // Border typically draws focus indicator.
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial() &&
+      border() && border()->ShouldAddFocusRing()) {
+    FocusRing::Uninstall(this);
+  }
   SchedulePaint();
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial())
-    FocusRing::Uninstall(this);
+  View::OnBlur();
 }
 
 gfx::Point Textfield::GetKeyboardContextMenuLocation() {
   return GetCaretBounds().bottom_right();
 }
 
 void Textfield::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   gfx::RenderText* render_text = GetRenderText();
   render_text->SetColor(GetTextColor());
   UpdateBackgroundColor();
@@ skipping 1039 matching lines @@
 }
 
 void Textfield::OnCursorBlinkTimerFired() {
   DCHECK(ShouldBlinkCursor());
   gfx::RenderText* render_text = GetRenderText();
   render_text->set_cursor_visible(!render_text->cursor_visible());
   RepaintCursor();
 }
 
 }  // namespace views