Move Range code to gfx.

ui/views/controls/textfield/native_textfield_views.h

 // Copyright (c) 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.
 
 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
 #define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
@@ skipping 112 matching lines @@
   virtual void UpdateIsObscured() OVERRIDE;
   virtual void UpdateEnabled() OVERRIDE;
   virtual gfx::Insets CalculateInsets() OVERRIDE;
   virtual void UpdateHorizontalMargins() OVERRIDE;
   virtual void UpdateVerticalMargins() OVERRIDE;
   virtual void UpdateVerticalAlignment() OVERRIDE;
   virtual bool SetFocus() OVERRIDE;
   virtual View* GetView() OVERRIDE;
   virtual gfx::NativeView GetTestingHandle() const OVERRIDE;
   virtual bool IsIMEComposing() const OVERRIDE;
-  virtual ui::Range GetSelectedRange() const OVERRIDE;
-  virtual void SelectRange(const ui::Range& range) OVERRIDE;
+  virtual gfx::Range GetSelectedRange() const OVERRIDE;
+  virtual void SelectRange(const gfx::Range& range) OVERRIDE;
   virtual gfx::SelectionModel GetSelectionModel() const OVERRIDE;
   virtual void SelectSelectionModel(const gfx::SelectionModel& sel) OVERRIDE;
   virtual size_t GetCursorPosition() const OVERRIDE;
   virtual bool GetCursorEnabled() const OVERRIDE;
   virtual void SetCursorEnabled(bool enabled) OVERRIDE;
   virtual bool HandleKeyPressed(const ui::KeyEvent& e) OVERRIDE;
   virtual bool HandleKeyReleased(const ui::KeyEvent& e) OVERRIDE;
   virtual void HandleFocus() OVERRIDE;
   virtual void HandleBlur() OVERRIDE;
   virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
   virtual void SetColor(SkColor value) OVERRIDE;
-  virtual void ApplyColor(SkColor value, const ui::Range& range) OVERRIDE;
+  virtual void ApplyColor(SkColor value, const gfx::Range& range) OVERRIDE;
   virtual void SetStyle(gfx::TextStyle style, bool value) OVERRIDE;
   virtual void ApplyStyle(gfx::TextStyle style,
                           bool value,
-                          const ui::Range& range) OVERRIDE;
+                          const gfx::Range& range) OVERRIDE;
   virtual void ClearEditHistory() OVERRIDE;
   virtual int GetFontHeight() OVERRIDE;
   virtual int GetTextfieldBaseline() const OVERRIDE;
   virtual int GetWidthNeededForText() const OVERRIDE;
   virtual void ExecuteTextCommand(int command_id) OVERRIDE;
   virtual bool HasTextBeingDragged() OVERRIDE;
 
   // ui::SimpleMenuModel::Delegate overrides
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
@@ skipping 23 matching lines @@
   virtual void InsertText(const string16& text) OVERRIDE;
   virtual void InsertChar(char16 ch, int flags) OVERRIDE;
   virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE;
   virtual ui::TextInputType GetTextInputType() const OVERRIDE;
   virtual ui::TextInputMode GetTextInputMode() const OVERRIDE;
   virtual bool CanComposeInline() const OVERRIDE;
   virtual gfx::Rect GetCaretBounds() OVERRIDE;
   virtual bool GetCompositionCharacterBounds(uint32 index,
                                              gfx::Rect* rect) OVERRIDE;
   virtual bool HasCompositionText() OVERRIDE;
-  virtual bool GetTextRange(ui::Range* range) OVERRIDE;
-  virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE;
-  virtual bool GetSelectionRange(ui::Range* range) OVERRIDE;
-  virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE;
-  virtual bool DeleteRange(const ui::Range& range) OVERRIDE;
-  virtual bool GetTextFromRange(const ui::Range& range,
+  virtual bool GetTextRange(gfx::Range* range) OVERRIDE;
+  virtual bool GetCompositionTextRange(gfx::Range* range) OVERRIDE;
+  virtual bool GetSelectionRange(gfx::Range* range) OVERRIDE;
+  virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE;
+  virtual bool DeleteRange(const gfx::Range& range) OVERRIDE;
+  virtual bool GetTextFromRange(const gfx::Range& range,
                                 string16* text) OVERRIDE;
   virtual void OnInputMethodChanged() OVERRIDE;
   virtual bool ChangeTextDirectionAndLayoutAlignment(
       base::i18n::TextDirection direction) OVERRIDE;
   virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE;
   virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE;
 
   // Overridden from TextfieldViewsModel::Delegate:
   virtual void OnCompositionTextConfirmedOrCleared() OVERRIDE;
 
@@ skipping 108 matching lines @@
   // Is the user potentially dragging and dropping from this view?
   bool initiating_drag_;
 
   // A runnable method factory for callback to update the cursor.
   base::WeakPtrFactory<NativeTextfieldViews> cursor_timer_;
 
   // State variables used to track double and triple clicks.
   size_t aggregated_clicks_;
   base::TimeDelta last_click_time_;
   gfx::Point last_click_location_;
-  ui::Range double_click_word_;
+  gfx::Range double_click_word_;
 
   // Context menu and its content list for the textfield.
   scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;
   scoped_ptr<views::MenuModelAdapter> context_menu_delegate_;
   scoped_ptr<views::MenuRunner> context_menu_runner_;
 
   scoped_ptr<ui::TouchSelectionController> touch_selection_controller_;
 
   // A timer to control the duration of showing the last typed char in
   // obscured text. When the timer is running, the last typed char is shown
   // and when the time expires, the last typed char is obscured.
   base::OneShotTimer<NativeTextfieldViews> obscured_reveal_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_