Add GetMinimumSize() for Labels and ensure it's zero for empty Links.

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 25 matching lines @@
 }
 
 SkColor Link::GetDefaultEnabledColor() {
 #if defined(OS_WIN)
   return color_utils::GetSysSkColor(COLOR_HOTLIGHT);
 #else
   return SkColorSetRGB(0, 51, 153);
 #endif
 }
 
-void Link::OnEnabledChanged() {
-  RecalculateFont();
-  View::OnEnabledChanged();
-}
-
 const char* Link::GetClassName() const {
   return kViewClassName;
 }
 
 gfx::NativeCursor Link::GetCursor(const ui::MouseEvent& event) {
   if (!enabled())
     return gfx::kNullCursor;
 #if defined(USE_AURA)
   return ui::kCursorHand;
 #elif defined(OS_WIN)
   static HCURSOR g_hand_cursor = LoadCursor(NULL, IDC_HAND);
   return g_hand_cursor;
 #endif
 }
 
-void Link::OnPaint(gfx::Canvas* canvas) {
-  Label::OnPaint(canvas);
-
-  if (HasFocus())
-    canvas->DrawFocusRect(GetLocalBounds());
-}
-
-void Link::OnFocus() {
-  Label::OnFocus();
-  // We render differently focused.
-  SchedulePaint();
-}
-
-void Link::OnBlur() {
-  Label::OnBlur();
-  // We render differently focused.
-  SchedulePaint();
-}
-
 bool Link::HitTestRect(const gfx::Rect& rect) const {
   // We need to allow clicks on the link. So we override the implementation in
   // Label and use the default implementation of View.
   return View::HitTestRect(rect);
 }
 
 bool Link::OnMousePressed(const ui::MouseEvent& event) {
   if (!enabled() ||
       (!event.IsLeftMouseButton() && !event.IsMiddleMouseButton()))
     return false;
@@ skipping 37 matching lines @@
 
   // Focus the link on key pressed.
   RequestFocus();
 
   if (listener_)
     listener_->LinkClicked(this, event.flags());
 
   return true;
 }
 
-bool Link::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
-  // Make sure we don't process space or enter as accelerators.
-  return (event.key_code() == ui::VKEY_SPACE) ||
-      (event.key_code() == ui::VKEY_RETURN);
-}
-
-void Link::GetAccessibleState(ui::AccessibleViewState* state) {
-  Label::GetAccessibleState(state);
-  state->role = ui::AccessibilityTypes::ROLE_LINK;
-}
-
 void Link::OnGestureEvent(ui::GestureEvent* event) {
   if (!enabled())
     return;
 
   if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
     SetPressed(true);
   } else if (event->type() == ui::ET_GESTURE_TAP) {
     RequestFocus();
     if (listener_)
       listener_->LinkClicked(this, event->flags());
   } else {
     SetPressed(false);
     return;
   }
   event->SetHandled();
 }
 
+bool Link::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
+  // Make sure we don't process space or enter as accelerators.
+  return (event.key_code() == ui::VKEY_SPACE) ||
+      (event.key_code() == ui::VKEY_RETURN);
+}
+
+void Link::GetAccessibleState(ui::AccessibleViewState* state) {
+  Label::GetAccessibleState(state);
+  state->role = ui::AccessibilityTypes::ROLE_LINK;
+}
+
+void Link::OnEnabledChanged() {
+  RecalculateFont();
+  View::OnEnabledChanged();
+}
+
+void Link::OnPaint(gfx::Canvas* canvas) {
+  Label::OnPaint(canvas);
+
+  if (HasFocus())
+    canvas->DrawFocusRect(GetLocalBounds());
+}
+
+void Link::OnFocus() {
+  Label::OnFocus();
+  // We render differently focused.
+  SchedulePaint();
+}
+
+void Link::OnBlur() {
+  Label::OnBlur();
+  // We render differently focused.
+  SchedulePaint();
+}
+
 void Link::SetFont(const gfx::Font& font) {
   Label::SetFont(font);
   RecalculateFont();
 }
 
+void Link::SetText(const 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.
+  set_focusable(!text.empty());
+}
+
 void Link::SetEnabledColor(SkColor color) {
   requested_enabled_color_ = color;
   if (!pressed_)
     Label::SetEnabledColor(requested_enabled_color_);
 }
 
 void Link::SetPressedColor(SkColor color) {
   requested_pressed_color_ = color;
   if (pressed_)
     Label::SetEnabledColor(requested_pressed_color_);
@@ skipping 13 matching lines @@
   SetEnabledColor(GetDefaultEnabledColor());
 #if defined(OS_WIN)
   SetDisabledColor(color_utils::GetSysSkColor(COLOR_WINDOWTEXT));
   SetPressedColor(SkColorSetRGB(200, 0, 0));
 #else
   // TODO(beng): source from theme provider.
   SetDisabledColor(SK_ColorBLACK);
   SetPressedColor(SK_ColorRED);
 #endif
   RecalculateFont();
-  set_focusable(true);
+
+  // Label::Init() calls SetText(), but if that's being called from Label(), our
+  // SetText() override will not be reached (because the constructed class is
+  // only a Label at the moment, not yet a Link).  So so the set_focusable()
+  // call explicitly here.
+  set_focusable(!text().empty());
 }
 
 void Link::SetPressed(bool pressed) {
   if (pressed_ != pressed) {
     pressed_ = pressed;
     Label::SetEnabledColor(pressed_ ?
         requested_pressed_color_ : requested_enabled_color_);
     RecalculateFont();
     SchedulePaint();
   }
 }
 
 void Link::RecalculateFont() {
   // Underline the link iff it is enabled and |underline_| is true.
   const int style = font().GetStyle();
   const int intended_style = (enabled() && underline_) ?
       (style | gfx::Font::UNDERLINE) : (style & ~gfx::Font::UNDERLINE);
   if (style != intended_style)
     Label::SetFont(font().DeriveFont(0, intended_style));
 }
 
 }  // namespace views