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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | ui/views/examples/label_example.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_CONTROLS_LABEL_H_ 5 #ifndef UI_VIEWS_CONTROLS_LABEL_H_
6 #define UI_VIEWS_CONTROLS_LABEL_H_ 6 #define UI_VIEWS_CONTROLS_LABEL_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "base/memory/scoped_vector.h"
11 #include "ui/gfx/render_text.h" 10 #include "ui/gfx/render_text.h"
12 #include "ui/views/view.h" 11 #include "ui/views/view.h"
13 12
14 namespace views { 13 namespace views {
15 14
16 // A view subclass that can display a string. 15 // A view subclass that can display a string.
17 class VIEWS_EXPORT Label : public View { 16 class VIEWS_EXPORT Label : public View {
18 public: 17 public:
19 // Internal class name. 18 // Internal class name.
20 static const char kViewClassName[]; 19 static const char kViewClassName[];
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 179
181 // Updates any colors that have not been explicitly set from the theme. 180 // Updates any colors that have not been explicitly set from the theme.
182 void UpdateColorsFromTheme(const ui::NativeTheme* theme); 181 void UpdateColorsFromTheme(const ui::NativeTheme* theme);
183 182
184 bool ShouldShowDefaultTooltip() const; 183 bool ShouldShowDefaultTooltip() const;
185 184
186 // An un-elided and single-line RenderText object used for preferred sizing. 185 // An un-elided and single-line RenderText object used for preferred sizing.
187 scoped_ptr<gfx::RenderText> render_text_; 186 scoped_ptr<gfx::RenderText> render_text_;
188 187
189 // The RenderText instances used to display elided and multi-line text. 188 // The RenderText instances used to display elided and multi-line text.
190 ScopedVector<gfx::RenderText> lines_; 189 std::vector<scoped_ptr<gfx::RenderText>> lines_;
191 190
192 SkColor requested_enabled_color_; 191 SkColor requested_enabled_color_;
193 SkColor actual_enabled_color_; 192 SkColor actual_enabled_color_;
194 SkColor requested_disabled_color_; 193 SkColor requested_disabled_color_;
195 SkColor actual_disabled_color_; 194 SkColor actual_disabled_color_;
196 SkColor background_color_; 195 SkColor background_color_;
197 196
198 // Set to true once the corresponding setter is invoked. 197 // Set to true once the corresponding setter is invoked.
199 bool enabled_color_set_; 198 bool enabled_color_set_;
200 bool disabled_color_set_; 199 bool disabled_color_set_;
(...skipping 14 matching lines...) Expand all
215 // TODO(ckocagil): Remove is_first_paint_text_ before crbug.com/441028 is 214 // TODO(ckocagil): Remove is_first_paint_text_ before crbug.com/441028 is
216 // closed. 215 // closed.
217 bool is_first_paint_text_; 216 bool is_first_paint_text_;
218 217
219 DISALLOW_COPY_AND_ASSIGN(Label); 218 DISALLOW_COPY_AND_ASSIGN(Label);
220 }; 219 };
221 220
222 } // namespace views 221 } // namespace views
223 222
224 #endif // UI_VIEWS_CONTROLS_LABEL_H_ 223 #endif // UI_VIEWS_CONTROLS_LABEL_H_
OLDNEW
« 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