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

Side by Side Diff: ui/views/controls/label.h

Issue 1015533016: Move allow_character_break property to RenderText. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months 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
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" 10 #include "base/memory/scoped_vector.h"
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 gfx::ElideBehavior elide_behavior_; 202 gfx::ElideBehavior elide_behavior_;
203 203
204 bool subpixel_rendering_enabled_; 204 bool subpixel_rendering_enabled_;
205 bool auto_color_readability_; 205 bool auto_color_readability_;
206 // TODO(mukai): remove |multi_line_| when all RenderText can render multiline. 206 // TODO(mukai): remove |multi_line_| when all RenderText can render multiline.
207 bool multi_line_; 207 bool multi_line_;
208 base::string16 tooltip_text_; 208 base::string16 tooltip_text_;
209 bool handles_tooltips_; 209 bool handles_tooltips_;
210 // Whether to collapse the label when it's not visible. 210 // Whether to collapse the label when it's not visible.
211 bool collapse_when_hidden_; 211 bool collapse_when_hidden_;
212 bool allow_character_break_;
213 int max_width_; 212 int max_width_;
214 213
215 // TODO(vadimt): Remove is_first_paint_text_ before crbug.com/431326 is 214 // TODO(vadimt): Remove is_first_paint_text_ before crbug.com/431326 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

Powered by Google App Engine
This is Rietveld 408576698