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

Unified Diff: ui/views/controls/styled_label.cc

Issue 24012002: Move Range code to gfx. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: d Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/styled_label.h ('k') | ui/views/controls/styled_label_listener.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/styled_label.cc
diff --git a/ui/views/controls/styled_label.cc b/ui/views/controls/styled_label.cc
index d679ac13ee56edfa3f21208850174d6ea05d56b4..268f3dbcb8abc8f15f58209759ac4a312ad8b772 100644
--- a/ui/views/controls/styled_label.cc
+++ b/ui/views/controls/styled_label.cc
@@ -95,11 +95,11 @@ void StyledLabel::SetText(const string16& text) {
PreferredSizeChanged();
}
-void StyledLabel::AddStyleRange(const ui::Range& range,
+void StyledLabel::AddStyleRange(const gfx::Range& range,
const RangeStyleInfo& style_info) {
DCHECK(!range.is_reversed());
DCHECK(!range.is_empty());
- DCHECK(ui::Range(0, text_.size()).Contains(range));
+ DCHECK(gfx::Range(0, text_.size()).Contains(range));
style_ranges_.push(StyleRange(range, style_info));
@@ -172,7 +172,7 @@ int StyledLabel::CalculateAndDoLayout(int width, bool dry_run) {
if (x == 0 && line > 0)
TrimWhitespace(remaining_string, TRIM_LEADING, &remaining_string);
- ui::Range range(ui::Range::InvalidRange());
+ gfx::Range range(gfx::Range::InvalidRange());
if (!style_ranges.empty())
range = style_ranges.top().range;
« no previous file with comments | « ui/views/controls/styled_label.h ('k') | ui/views/controls/styled_label_listener.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698