Move Range code to gfx.

ui/views/controls/textfield/textfield_views_model.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_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
 
 #include <list>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/views_export.h"
 
 namespace gfx {
+class Range;
 class RenderText;
 }  // namespace gfx
 
-namespace ui {
-class Range;
-}  // namespace ui
-
 namespace views {
 
 namespace internal {
 // Internal Edit class that keeps track of edits for undo/redo.
 class Edit;
 
 // C++ doesn't allow forward decl enum, so let's define here.
 enum MergeType {
   // The edit should not be merged with next edit. It still may
   // be merged with an edit with MERGE_WITH_PREVIOUS.
@@ skipping 98 matching lines @@
   bool MoveCursorTo(const gfx::Point& point, bool select);
 
   // Selection related method
 
   // Returns the selected text.
   string16 GetSelectedText() const;
 
   // The current composition text will be confirmed. The selection starts with
   // the range's start position, and ends with the range's end position,
   // therefore the cursor position becomes the end position.
-  void SelectRange(const ui::Range& range);
+  void SelectRange(const gfx::Range& range);
 
   // The current composition text will be confirmed.
   // render_text_'s selection model is set to |sel|.
   void SelectSelectionModel(const gfx::SelectionModel& sel);
 
   // Select the entire text range. If |reversed| is true, the range will end at
   // the logical beginning of the text; this generally shows the leading portion
   // of text that overflows its display area.
   // The current composition text will be confirmed.
   void SelectAll(bool reversed);
@@ skipping 39 matching lines @@
   // Deletes the selected text. This method shouldn't be called with
   // composition text.
   void DeleteSelection();
 
   // Deletes the selected text (if any) and insert text at given
   // position.
   void DeleteSelectionAndInsertTextAt(
       const string16& text, size_t position);
 
   // Retrieves the text content in a given range.
-  string16 GetTextFromRange(const ui::Range& range) const;
+  string16 GetTextFromRange(const gfx::Range& range) const;
 
   // Retrieves the range containing all text in the model.
-  void GetTextRange(ui::Range* range) const;
+  void GetTextRange(gfx::Range* range) const;
 
   // Sets composition text and attributes. If there is composition text already,
   // it'll be replaced by the new one. Otherwise, current selection will be
   // replaced. If there is no selection, the composition text will be inserted
   // at the insertion point.
   // Any changes to the model except text insertion will confirm the current
   // composition text.
   void SetCompositionText(const ui::CompositionText& composition);
 
   // Converts current composition text into final content.
   void ConfirmCompositionText();
 
   // Removes current composition text.
   void CancelCompositionText();
 
   // Retrieves the range of current composition text.
-  void GetCompositionTextRange(ui::Range* range) const;
+  void GetCompositionTextRange(gfx::Range* range) const;
 
   // Returns true if there is composition text.
   bool HasCompositionText() const;
 
  private:
   friend class NativeTextfieldViews;
   friend class NativeTextfieldViewsTest;
   friend class TextfieldViewsModelTest;
   friend class UndoRedo_BasicTest;
   friend class UndoRedo_CutCopyPasteTest;
@@ skipping 13 matching lines @@
   // edit in the edit history.
   void ReplaceTextInternal(const string16& text, bool mergeable);
 
   // Clears all edit history.
   void ClearEditHistory();
 
   // Clears redo history.
   void ClearRedoHistory();
 
   // Executes and records edit operations.
-  void ExecuteAndRecordDelete(ui::Range range, bool mergeable);
+  void ExecuteAndRecordDelete(gfx::Range range, bool mergeable);
   void ExecuteAndRecordReplaceSelection(internal::MergeType merge_type,
                                         const string16& text);
   void ExecuteAndRecordReplace(internal::MergeType merge_type,
                                size_t old_cursor_pos,
                                size_t new_cursor_pos,
                                const string16& text,
                                size_t new_text_start);
   void ExecuteAndRecordInsert(const string16& text, bool mergeable);
 
   // Adds or merge |edit| into edit history. Return true if the edit
@@ skipping 35 matching lines @@
   // 2) new edit is added. (redo history is cleared)
   // 3) redone all undone edits.
   EditHistory::iterator current_edit_;
 
   DISALLOW_COPY_AND_ASSIGN(TextfieldViewsModel);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_