| Index: ui/views/controls/label.h
|
| diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h
|
| index 03eade981af0e8d38aeb93c7ee45c1b0ca15bb76..bf5f096f0c90b20562cac6bf64121f382037fc63 100644
|
| --- a/ui/views/controls/label.h
|
| +++ b/ui/views/controls/label.h
|
| @@ -135,6 +135,13 @@ class VIEWS_EXPORT Label : public View {
|
| void OnEnabledChanged() override;
|
|
|
| protected:
|
| + // Create a single RenderText instance to actually be painted.
|
| + virtual scoped_ptr<gfx::RenderText> CreateRenderText(
|
| + const base::string16& text,
|
| + gfx::HorizontalAlignment alignment,
|
| + gfx::DirectionalityMode directionality,
|
| + gfx::ElideBehavior elide_behavior);
|
| +
|
| void PaintText(gfx::Canvas* canvas);
|
|
|
| SkColor disabled_color() const { return actual_disabled_color_; }
|
| @@ -157,13 +164,6 @@ class VIEWS_EXPORT Label : public View {
|
|
|
| void ResetLayout();
|
|
|
| - // Create a single RenderText instance to actually be painted.
|
| - scoped_ptr<gfx::RenderText> CreateRenderText(
|
| - const base::string16& text,
|
| - gfx::HorizontalAlignment alignment,
|
| - gfx::DirectionalityMode directionality,
|
| - gfx::ElideBehavior elide_behavior);
|
| -
|
| // Set up |lines_| to actually be painted.
|
| void MaybeBuildRenderTextLines();
|
|
|
|
|