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

ui/views/controls/styled_label.h

 // Copyright 2013 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_STYLED_LABEL_H_
 #define UI_VIEWS_CONTROLS_STYLED_LABEL_H_
 
+#include <list>
 #include <map>
-#include <queue>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/view.h"
 
 namespace views {
@@ skipping 58 matching lines @@
 
   void set_auto_color_readability_enabled(bool auto_color_readability) {
     auto_color_readability_enabled_ = auto_color_readability;
   }
 
   // View implementation:
   virtual gfx::Insets GetInsets() const OVERRIDE;
   virtual int GetHeightForWidth(int w) OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void PreferredSizeChanged() OVERRIDE;
+  virtual void ViewHierarchyChanged(
+      const ViewHierarchyChangedDetails& details) OVERRIDE;
+  virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE;
 
   // LinkListener implementation:
   virtual void LinkClicked(Link* source, int event_flags) OVERRIDE;
 
  private:
   struct StyleRange {
     StyleRange(const gfx::Range& range,
                const RangeStyleInfo& style_info)
         : range(range),
           style_info(style_info) {
     }
     ~StyleRange() {}
 
     bool operator<(const StyleRange& other) const;
 
     gfx::Range range;
     RangeStyleInfo style_info;
   };
+  typedef std::list<StyleRange> StyleRanges;
 
   // Calculates how to layout child views, creates them and sets their size
   // and position. |width| is the horizontal space, in pixels, that the view
   // has to work with. If |dry_run| is true, the view hierarchy is not touched.
-  // The return value is the height in pixels.
-  int CalculateAndDoLayout(int width, bool dry_run);
+  // The return value is the necessary size.
+  gfx::Size CalculateAndDoLayout(int width, bool dry_run);
 
   // The text to display.
   string16 text_;
 
   // The default style to use for any part of the text that isn't within
   // a range in |style_ranges_|.
   RangeStyleInfo default_style_info_;
 
   // The listener that will be informed of link clicks.
   StyledLabelListener* listener_;
 
   // The ranges that should be linkified, sorted by start position.
-  std::priority_queue<StyleRange> style_ranges_;
+  StyleRanges style_ranges_;
 
   // A mapping from a view to the range it corresponds to in |text_|. Only views
   // that correspond to ranges with is_link style set will be added to the map.
   std::map<View*, gfx::Range> link_targets_;
 
   // This variable saves the result of the last GetHeightForWidth call in order
   // to avoid repeated calculation.
   gfx::Size calculated_size_;
 
+  // Saves the most recent value of IsDrawn() as of the last call to
+  // GetInsets(), since if this changes, we may need to recalulate our size.
+  mutable bool is_drawn_;
+
   // Background color on which the label is drawn, for auto color readability.
   SkColor displayed_on_background_color_;
   bool displayed_on_background_color_set_;
 
   // Controls whether the text is automatically re-colored to be readable on the
   // background.
   bool auto_color_readability_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(StyledLabel);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_STYLED_LABEL_H_