Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Unified Diff: ui/views/controls/label.h

Issue 1455333002: views: Remove a few usages of the deprecated ScopedVector. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/views/examples/label_example.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « no previous file | ui/views/examples/label_example.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698