Remove View::focusable().

ui/views/controls/label.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/label.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 20 matching lines @@
 
 const gfx::FontList& GetDefaultFontList() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
 }
 
 }  // namespace
 
 // static
 const char Label::kViewClassName[] = "Label";
-const int Label::kFocusBorderPadding = 1;
 
 Label::Label() : Label(base::string16()) {
 }
 
 Label::Label(const base::string16& text) : Label(text, GetDefaultFontList()) {
 }
 
 Label::Label(const base::string16& text, const gfx::FontList& font_list) {
   Init(text, font_list);
 }
@@ skipping 152 matching lines @@
   if (lines_.empty())
     return result;
   result.append(lines_[0]->GetDisplayText());
   for (size_t i = 1; i < lines_.size(); ++i) {
     result.append(1, '\n');
     result.append(lines_[i]->GetDisplayText());
   }
   return result;
 }
 
-gfx::Insets Label::GetInsets() const {

[sky, 2016/04/27 16:34:20]

Is there a reason to remove this? Isn't is possible someone is creating a label
and making it focusable?

-  gfx::Insets insets = View::GetInsets();
-  if (focusable()) {
-    insets += gfx::Insets(kFocusBorderPadding, kFocusBorderPadding,
-                          kFocusBorderPadding, kFocusBorderPadding);
-  }
-  return insets;
-}
-
 int Label::GetBaseline() const {
   return GetInsets().top() + font_list().GetBaseline();
 }
 
 gfx::Size Label::GetPreferredSize() const {
   // Return a size of (0, 0) if the label is not visible and if the
   // |collapse_when_hidden_| flag is set.
   // TODO(munjal): This logic probably belongs to the View class. But for now,
   // put it here since putting it in View class means all inheriting classes
   // need to respect the |collapse_when_hidden_| flag.
@@ skipping 194 matching lines @@
   InvalidateLayout();
   PreferredSizeChanged();
   SchedulePaint();
   lines_.clear();
 }
 
 void Label::MaybeBuildRenderTextLines() {
   if (!lines_.empty())
     return;
 
-  gfx::Rect rect = GetContentsBounds();
-  if (focusable())
-    rect.Inset(kFocusBorderPadding, kFocusBorderPadding);
+  // GetContentBounds() does not use GetInsets() which may be overriden in Label

[sky, 2016/04/28 00:05:56]

ick. We should fix GetcontentsBounds to call GetInsets.

[karandeepb, 2016/04/28 00:13:34]

Will assign a bug to myself and fix this. 

+  // subclasses which are focusable, for eg, link. Hence use GetLocalBounds().
+  gfx::Rect rect = GetLocalBounds();
+  rect.Inset(GetInsets());
   if (rect.IsEmpty())
     return;
   rect.Inset(-gfx::ShadowValue::GetMargin(shadows()));
 
   gfx::HorizontalAlignment alignment = horizontal_alignment();
   gfx::DirectionalityMode directionality = render_text_->directionality_mode();
   if (multi_line()) {
     // Force the directionality and alignment of the first line on other lines.
     bool rtl =
         render_text_->GetDisplayTextDirection() == base::i18n::RIGHT_TO_LEFT;
@@ skipping 40 matching lines @@
   gfx::Rect focus_bounds;
   if (lines_.empty()) {
     focus_bounds = gfx::Rect(GetTextSize());
   } else {
     for (size_t i = 0; i < lines_.size(); ++i) {
       gfx::Point origin;
       origin += lines_[i]->GetLineOffset(0);
       focus_bounds.Union(gfx::Rect(origin, lines_[i]->GetStringSize()));
     }
   }
-
-  focus_bounds.Inset(-kFocusBorderPadding, -kFocusBorderPadding);
+  focus_bounds.Inset(-GetInsets());

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

This will be different from the current value if the focused link also has an
explicitly set border. Is this case possible?

   focus_bounds.Intersect(GetLocalBounds());
   return focus_bounds;
 }
 
 std::vector<base::string16> Label::GetLinesForWidth(int width) const {
   std::vector<base::string16> lines;
   // |width| can be 0 when getting the default text size, in that case
   // the ideal lines (i.e. broken at newline characters) are wanted.
   if (width <= 0) {
     lines = base::SplitString(
@@ skipping 75 matching lines @@
 }
 
 bool Label::ShouldShowDefaultTooltip() const {
   const gfx::Size text_size = GetTextSize();
   const gfx::Size size = GetContentsBounds().size();
   return !obscured() && (text_size.width() > size.width() ||
                          (multi_line() && text_size.height() > size.height()));
 }
 
 }  // namespace views