StyledLabel: Added AddEmbeddedView method.

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>
 
@@ skipping 55 matching lines @@
   void SetText(const base::string16& text);
 
   // Sets the fonts used by all labels. Can be augemented by styling set by
   // AddStyleRange and SetDefaultStyle.
   void SetBaseFontList(const gfx::FontList& font_list);
 
   // Marks the given range within |text_| with style defined by |style_info|.
   // |range| must be contained in |text_|.
   void AddStyleRange(const gfx::Range& range, const RangeStyleInfo& style_info);
 
+  // Inserts a |view| into the given |position| within |text_|. |position| must
+  // be contained in |text_|. Takes ownership of |view| (which should not
+  // already be parented within the views hierarchy).
+  void AddEmbeddedView(uint32_t position, scoped_ptr<View> view);
+
   // Sets the default style to use for any part of the text that isn't within
   // a range set by AddStyleRange.
   void SetDefaultStyle(const RangeStyleInfo& style_info);
 
   // Get or set the distance in pixels between baselines of multi-line text.
   // Default is 0, indicating the distance between lines should be the standard
   // one for the label's text, font list, and platform.
   void SetLineHeight(int height);
 
   // Sets the color of the background on which the label is drawn. This won't
@@ skipping 23 matching lines @@
   int GetHeightForWidth(int w) const override;
   void Layout() override;
   void PreferredSizeChanged() override;
 
   // LinkListener implementation:
   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) {
-    }
+               const RangeStyleInfo& style_info,
+               View* embedded_view)
+        : range(range), style_info(style_info), embedded_view(embedded_view) {}
     ~StyleRange() {}
 
     bool operator<(const StyleRange& other) const;
 
     gfx::Range range;
     RangeStyleInfo style_info;
+    // Pointer to an element of |embedded_views_|. Can be null. If non-null, the
+    // text range is replaced by the embedded view and |style_info| is ignored.
+    View* embedded_view;
   };
   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. Caches
   // the results in |calculated_size_|, |width_at_last_layout_|, and
   // |width_at_last_size_calculation_|. Returns the needed size.
   gfx::Size CalculateAndDoLayout(int width, bool dry_run);
 
@@ skipping 13 matching lines @@
   // The listener that will be informed of link clicks.
   StyledLabelListener* listener_;
 
   // The ranges that should be linkified, sorted by start position.
   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_;
 
+  // List of views embedded within the label. These views have owned_by_client
+  // set so get deleted by the scoped_ptr destructor (not the views hierarchy).
+  std::vector<scoped_ptr<View>> embedded_views_;
+
   // This variable saves the result of the last GetHeightForWidth call in order
   // to avoid repeated calculation.
   mutable gfx::Size calculated_size_;
   mutable int width_at_last_size_calculation_;
   int width_at_last_layout_;
 
   // 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_