| Index: ui/views/controls/label.h
|
| diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h
|
| index b01d703bcd06d5ead695b8da4ff82864e3ee1cce..6d0764651d4fdd9db49142ed0263f0c5aaaf6195 100644
|
| --- a/ui/views/controls/label.h
|
| +++ b/ui/views/controls/label.h
|
| @@ -7,7 +7,6 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/gtest_prod_util.h"
|
| -#include "base/memory/scoped_vector.h"
|
| #include "ui/gfx/render_text.h"
|
| #include "ui/views/view.h"
|
|
|
| @@ -187,7 +186,7 @@ class VIEWS_EXPORT Label : public View {
|
| scoped_ptr<gfx::RenderText> render_text_;
|
|
|
| // The RenderText instances used to display elided and multi-line text.
|
| - ScopedVector<gfx::RenderText> lines_;
|
| + std::vector<scoped_ptr<gfx::RenderText>> lines_;
|
|
|
| SkColor requested_enabled_color_;
|
| SkColor actual_enabled_color_;
|
|
|