MD links - underline to indicate focus.

ui/views/controls/link.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/link.h"
 
 #include "build/build_config.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 124 matching lines @@
   state->role = ui::AX_ROLE_LINK;
 }
 
 void Link::OnEnabledChanged() {
   RecalculateFont();
   View::OnEnabledChanged();
 }
 
 void Link::OnFocus() {
   Label::OnFocus();
+  RecalculateFont();
   // We render differently focused.
   SchedulePaint();
 }
 
 void Link::OnBlur() {
   Label::OnBlur();
+  RecalculateFont();
   // We render differently focused.
   SchedulePaint();
 }
 
 void Link::SetFontList(const gfx::FontList& font_list) {
   Label::SetFontList(font_list);
   RecalculateFont();
 }
 
 void Link::SetText(const base::string16& text) {
@@ skipping 42 matching lines @@
 void Link::SetPressed(bool pressed) {
   if (pressed_ != pressed) {
     pressed_ = pressed;
     Label::SetEnabledColor(GetEnabledColor());
     RecalculateFont();
     SchedulePaint();
   }
 }
 
 void Link::RecalculateFont() {
-  // Underline the link iff it is enabled and |underline_| is true.
+  // Underline the link if it is enabled and |underline_| is true. Also
+  // underline to indicate focus in MD.
   const int style = font_list().GetFontStyle();
-  const int intended_style = (enabled() && underline_) ?
+  const bool underline =
+      underline_ ||
+      (HasFocus() && ui::MaterialDesignController::IsSecondaryUiMaterial());
+  const int intended_style = (enabled() && underline) ?
       (style | gfx::Font::UNDERLINE) : (style & ~gfx::Font::UNDERLINE);
+
   if (style != intended_style)
     Label::SetFontList(font_list().DeriveWithStyle(intended_style));
 }
 
 void Link::ConfigureFocus() {
   // Disable focusability for empty links.  Otherwise Label::GetInsets() will
   // give them an unconditional 1-px. inset on every side to allow for a focus
   // border, when in this case we probably wanted zero width.
   if (text().empty()) {
     SetFocusBehavior(FocusBehavior::NEVER);
@@ skipping 18 matching lines @@
   }
 
   if (!requested_pressed_color_set_ && GetNativeTheme())
     return GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::kColorId_LinkPressed);
 
   return requested_pressed_color_;
 }
 
 }  // namespace views