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

ui/views/controls/label.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_LABEL_H_
 #define UI_VIEWS_CONTROLS_LABEL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/view.h"
 
 namespace views {
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Label class
 //
 // A label is a view subclass that can display a string.
 //
 /////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT Label : public View {
  public:
-  // Internal class name.
-  static const char kViewClassName[];
-
   // The following enum is used to indicate whether using the Chrome UI's
   // directionality as the label's directionality, or auto-detecting the label's
   // directionality.
   //
   // If the label text originates from the Chrome UI, we should use the Chrome
   // UI's directionality as the label's directionality.
   //
   // If the text originates from a web page, its directionality is determined
   // based on its first character with strong directionality, disregarding what
   // directionality the Chrome UI is.
   enum DirectionalityMode {
     USE_UI_DIRECTIONALITY = 0,
     AUTO_DETECT_DIRECTIONALITY
   };
 
   enum ElideBehavior {
     NO_ELIDE,         // Do not elide the label text; truncate as needed.
     ELIDE_IN_MIDDLE,  // Add ellipsis in the middle of the string as needed.
     ELIDE_AT_END,     // Add ellipsis at the end of the string as needed.
     ELIDE_AS_EMAIL,   // Elide while retaining username/domain chars as needed.
   };
 
+  // Internal class name.
+  static const char kViewClassName[];
+
+  // The padding for the focus border when rendering focused text.
+  static const int kFocusBorderPadding;
+
   Label();
   explicit Label(const string16& text);
   Label(const string16& text, const gfx::FontList& font_list);
   Label(const string16& text, const gfx::Font& font);  // OBSOLETE
   virtual ~Label();
 
   // Gets or sets the fonts used by this label.
   const gfx::FontList& font_list() const { return font_list_; }
   virtual void SetFontList(const gfx::FontList& font_list);
   // Obsolete gfx::Font version.  Should use gfx::FontList version instead.
   const gfx::Font& font() const;  // OBSOLETE
   virtual void SetFont(const gfx::Font& font);  // OBSOLETE
 
   // Get or set the label text.
   const string16& text() const { return text_; }
-  void SetText(const string16& text);
+  virtual void SetText(const string16& text);
 
   // Enables or disables auto-color-readability (enabled by default).  If this
   // is enabled, then calls to set any foreground or background color will
   // trigger an automatic mapper that uses color_utils::GetReadableColor() to
   // ensure that the foreground colors are readable over the background color.
   void SetAutoColorReadabilityEnabled(bool enabled);
 
   // Sets the color.  This will automatically force the color to be readable
   // over the current background color.
   virtual void SetEnabledColor(SkColor color);
@@ skipping 72 matching lines @@
   // |max_width| is the maximum width that will be used (longer lines will be
   // wrapped).  If 0, no maximum width is enforced.
   void SizeToFit(int max_width);
 
   // Gets/sets the flag to determine whether the label should be collapsed when
   // it's hidden (not visible). If this flag is true, the label will return a
   // preferred size of (0, 0) when it's not visible.
   void set_collapse_when_hidden(bool value) { collapse_when_hidden_ = value; }
   bool collapse_when_hidden() const { return collapse_when_hidden_; }
 
-  void SetHasFocusBorder(bool has_focus_border);
-
   // Overridden from View:
   virtual gfx::Insets GetInsets() const OVERRIDE;
   virtual int GetBaseline() const OVERRIDE;
   // Overridden to compute the size required to display this label.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
+  // Returns the width of an ellipsis if the label is non-empty, or 0 otherwise.
+  virtual gfx::Size GetMinimumSize() OVERRIDE;
   // Returns the height necessary to display this label with the provided width.
   // This method is used to layout multi-line labels. It is equivalent to
   // GetPreferredSize().height() if the receiver is not multi-line.
   virtual int GetHeightForWidth(int w) OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
   virtual View* GetTooltipHandlerForPoint(const gfx::Point& point) OVERRIDE;
   virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   // Gets the tooltip text for labels that are wider than their bounds, except
   // when the label is multiline, in which case it just returns false (no
@@ skipping 78 matching lines @@
   bool allow_character_break_;
   ElideBehavior elide_behavior_;
   gfx::HorizontalAlignment horizontal_alignment_;
   string16 tooltip_text_;
   // Whether to collapse the label when it's not visible.
   bool collapse_when_hidden_;
   // The following member variable is used to control whether the
   // directionality is auto-detected based on first strong directionality
   // character or is determined by chrome UI's locale.
   DirectionalityMode directionality_mode_;
-  // When embedded in a larger control that is focusable, setting this flag
-  // allows this view to reserve space for a focus border that it otherwise
-  // might not have because it is not itself focusable.
-  bool has_focus_border_;
 
   // Colors for shadow.
   SkColor enabled_shadow_color_;
   SkColor disabled_shadow_color_;
 
   // Space between text and shadow.
   gfx::Point shadow_offset_;
 
   // Should a shadow be drawn behind the text?
   bool has_shadow_;
 
   // The cached heights to avoid recalculation in GetHeightForWidth().
   std::vector<gfx::Size> cached_heights_;
   int cached_heights_cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_LABEL_H_