Move Range code to gfx.

ui/gfx/render_text_win.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_GFX_RENDER_TEXT_WIN_H_
 #define UI_GFX_RENDER_TEXT_WIN_H_
 
 #include <usp10.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/gfx/render_text.h"
 
 namespace gfx {
 
 namespace internal {
 
 struct TextRun {
   TextRun();
   ~TextRun();
 
-  ui::Range range;
+  gfx::Range range;
   Font font;
   // A gfx::Font::FontStyle flag to specify bold and italic styles.
   // Supersedes |font.GetFontStyle()|. Stored separately to avoid calling
   // |font.DeriveFont()|, which is expensive on Windows.
   int font_style;
 
   bool strike;
   bool diagonal_strike;
   bool underline;
 
@@ skipping 32 matching lines @@
   virtual std::vector<FontSpan> GetFontSpansForTesting() OVERRIDE;
 
  protected:
   // Overridden from RenderText:
   virtual SelectionModel AdjacentCharSelectionModel(
       const SelectionModel& selection,
       VisualCursorDirection direction) OVERRIDE;
   virtual SelectionModel AdjacentWordSelectionModel(
       const SelectionModel& selection,
       VisualCursorDirection direction) OVERRIDE;
-  virtual ui::Range GetGlyphBounds(size_t index) OVERRIDE;
-  virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE;
+  virtual gfx::Range GetGlyphBounds(size_t index) OVERRIDE;
+  virtual std::vector<Rect> GetSubstringBounds(
+      const gfx::Range& range) OVERRIDE;
   virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE;
   virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE;
   virtual bool IsCursorablePosition(size_t position) OVERRIDE;
   virtual void ResetLayout() OVERRIDE;
   virtual void EnsureLayout() OVERRIDE;
   virtual void DrawVisualText(Canvas* canvas) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters);
 
@@ skipping 40 matching lines @@
   scoped_ptr<int[]> logical_to_visual_;
 
   bool needs_layout_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderTextWin);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_WIN_H_