Remove View::focusable().

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"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/native_cursor.h"
 
 namespace views {
 
+// static
 const char Link::kViewClassName[] = "Link";
+const int Link::kFocusBorderPadding = 1;
 
 Link::Link() : Link(base::string16()) {}
 
 Link::Link(const base::string16& title)
     : Label(title),
       requested_enabled_color_(gfx::kPlaceholderColor),
       requested_enabled_color_set_(false),
       requested_pressed_color_(gfx::kPlaceholderColor),
       requested_pressed_color_set_(false) {
   Init();
@@ skipping 115 matching lines @@
   SchedulePaint();
 }
 
 void Link::SetFontList(const gfx::FontList& font_list) {
   Label::SetFontList(font_list);
   RecalculateFont();
 }
 
 void Link::SetText(const base::string16& text) {
   Label::SetText(text);
-  // 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.
+  // Disable focusability for empty links.
   SetFocusBehavior(text.empty() ? FocusBehavior::NEVER : FocusBehavior::ALWAYS);
 }
 
 void Link::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   Label::SetEnabledColor(GetEnabledColor());
   SetDisabledColor(
       theme->GetSystemColor(ui::NativeTheme::kColorId_LinkDisabled));
 }
 
 void Link::SetEnabledColor(SkColor color) {
   requested_enabled_color_set_ = true;
   requested_enabled_color_ = color;
   Label::SetEnabledColor(GetEnabledColor());
 }
 
+gfx::Insets Link::GetInsets() const {
+  gfx::Insets insets = Label::GetInsets();
+  // Non-empty links will have a focus border around them.
+  if (!text().empty()) {

[karandeepb, 2016/04/27 08:04:40]

There are 1-2 instances where the focusability of a link is explicitly set to
NEVER. This will cause even those links to have an inset.

+    insets += gfx::Insets(kFocusBorderPadding, kFocusBorderPadding,
+                          kFocusBorderPadding, kFocusBorderPadding);
+  }
+  return insets;
+}
+
 void Link::SetPressedColor(SkColor color) {
   requested_pressed_color_set_ = true;
   requested_pressed_color_ = color;
   Label::SetEnabledColor(GetEnabledColor());
 }
 
 void Link::SetUnderline(bool underline) {
   if (underline_ == underline)
     return;
   underline_ = underline;
@@ skipping 44 matching lines @@
   }
 
   if (!requested_pressed_color_set_ && GetNativeTheme())
     return GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::kColorId_LinkPressed);
 
   return requested_pressed_color_;
 }
 
 }  // namespace views