Move Range code to gfx.

ui/views/controls/styled_label.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/styled_label.h"
 
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "ui/base/text/text_elider.h"
@@ skipping 77 matching lines @@
 
 StyledLabel::~StyledLabel() {}
 
 void StyledLabel::SetText(const string16& text) {
   text_ = text;
   style_ranges_ = std::priority_queue<StyleRange>();
   RemoveAllChildViews(true);
   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));
 
   PreferredSizeChanged();
 }
 
 void StyledLabel::SetDefaultStyle(const RangeStyleInfo& style_info) {
   default_style_info_ = style_info;
   PreferredSizeChanged();
 }
@@ skipping 52 matching lines @@
   std::priority_queue<StyleRange> style_ranges = style_ranges_;
 
   // Iterate over the text, creating a bunch of labels and links and laying them
   // out in the appropriate positions.
   while (!remaining_string.empty()) {
     // Don't put whitespace at beginning of a line with an exception for the
     // first line (so the text's leading whitespace is respected).
     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;
 
     const size_t position = text_.size() - remaining_string.size();
 
     const gfx::Rect chunk_bounds(x, 0, width - x, 2 * line_height);
     std::vector<string16> substrings;
     gfx::Font text_font;
     // If the start of the remaining text is inside a styled range, the font
     // style may differ from the base font. The font specified by the range
@@ skipping 75 matching lines @@
     }
     x += view_size.width() - 2 * overlap;
 
     remaining_string = remaining_string.substr(chunk.size());
   }
 
   return (line + 1) * line_height + GetInsets().height();
 }
 
 }  // namespace views