Remove View::focusable() - Alternate approach.

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 195 matching lines @@
   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 {
   gfx::Insets insets = View::GetInsets();
-  if (focusable()) {
+  if (IsFocusable()) {
     insets += gfx::Insets(kFocusBorderPadding, kFocusBorderPadding,
                           kFocusBorderPadding, kFocusBorderPadding);
   }
   return insets;
 }
 
 int Label::GetBaseline() const {
   return GetInsets().top() + font_list().GetBaseline();
 }
 
@@ skipping 99 matching lines @@
     // Note that |render_text_| is never elided (see the comment in Init() too).
     tooltip->assign(render_text_->GetDisplayText());
     return true;
   }
 
   return false;
 }
 
 void Label::OnEnabledChanged() {
   RecalculateColors();
+
+  // If the label has become focusable now due to being enabled, GetInsets()
+  // will return a different value. Hence reset layout.

[karandeepb, 2016/04/27 23:53:17]

I am not totally sure whether this is needed or not.

+  if (IsFocusable())
+    ResetLayout();
 }
 
 std::unique_ptr<gfx::RenderText> Label::CreateRenderText(
     const base::string16& text,
     gfx::HorizontalAlignment alignment,
     gfx::DirectionalityMode directionality,
     gfx::ElideBehavior elide_behavior) {
   std::unique_ptr<gfx::RenderText> render_text(
       render_text_->CreateInstanceOfSameType());
   render_text->SetHorizontalAlignment(alignment);
@@ skipping 44 matching lines @@
   View::OnDeviceScaleFactorChanged(device_scale_factor);
   // When the device scale factor is changed, some font rendering parameters is
   // changed (especially, hinting). The bounding box of the text has to be
   // re-computed based on the new parameters. See crbug.com/441439
   ResetLayout();
 }
 
 void Label::VisibilityChanged(View* starting_from, bool is_visible) {
   if (!is_visible)
     lines_.clear();
+
+  // If the label has become focusable now due to being visible, GetInsets()
+  // will return a different value. Hence reset layout.
+  if (IsFocusable())
+    ResetLayout();
 }
 
 void Label::Init(const base::string16& text, const gfx::FontList& font_list) {
   render_text_.reset(gfx::RenderText::CreateInstance());
   render_text_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
   render_text_->SetDirectionalityMode(gfx::DIRECTIONALITY_FROM_TEXT);
   // NOTE: |render_text_| should not be elided at all. This is used to keep some
   // properties and to compute the size of the string.
   render_text_->SetElideBehavior(gfx::NO_ELIDE);
   render_text_->SetFontList(font_list);
@@ skipping 18 matching lines @@
   PreferredSizeChanged();
   SchedulePaint();
   lines_.clear();
 }
 
 void Label::MaybeBuildRenderTextLines() {
   if (!lines_.empty())
     return;
 
   gfx::Rect rect = GetContentsBounds();
-  if (focusable())
+  if (IsFocusable())
     rect.Inset(kFocusBorderPadding, kFocusBorderPadding);
   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 =
@@ skipping 138 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