Move Range code to gfx.

ui/views/controls/textfield/textfield.cc

 // 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.
 
 #include "ui/views/controls/textfield/textfield.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "ui/base/range/range.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/insets.h"
+#include "ui/gfx/range/range.h"
 #include "ui/gfx/selection_model.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/controls/textfield/native_textfield_wrapper.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
@@ skipping 326 matching lines @@
       if (controller_)
         controller_->ContentsChanged(this, text_);
     }
   }
 }
 
 bool Textfield::IsIMEComposing() const {
   return native_wrapper_ && native_wrapper_->IsIMEComposing();
 }
 
-ui::Range Textfield::GetSelectedRange() const {
+gfx::Range Textfield::GetSelectedRange() const {
   return native_wrapper_->GetSelectedRange();
 }
 
-void Textfield::SelectRange(const ui::Range& range) {
+void Textfield::SelectRange(const gfx::Range& range) {
   native_wrapper_->SelectRange(range);
 }
 
 gfx::SelectionModel Textfield::GetSelectionModel() const {
   return native_wrapper_->GetSelectionModel();
 }
 
 void Textfield::SelectSelectionModel(const gfx::SelectionModel& sel) {
   native_wrapper_->SelectSelectionModel(sel);
 }
 
 size_t Textfield::GetCursorPosition() const {
   return native_wrapper_->GetCursorPosition();
 }
 
 void Textfield::SetColor(SkColor value) {
   return native_wrapper_->SetColor(value);
 }
 
-void Textfield::ApplyColor(SkColor value, const ui::Range& range) {
+void Textfield::ApplyColor(SkColor value, const gfx::Range& range) {
   return native_wrapper_->ApplyColor(value, range);
 }
 
 void Textfield::SetStyle(gfx::TextStyle style, bool value) {
   return native_wrapper_->SetStyle(style, value);
 }
 
 void Textfield::ApplyStyle(gfx::TextStyle style,
                            bool value,
-                           const ui::Range& range) {
+                           const gfx::Range& range) {
   return native_wrapper_->ApplyStyle(style, value, range);
 }
 
 void Textfield::ClearEditHistory() {
   native_wrapper_->ClearEditHistory();
 }
 
 void Textfield::SetAccessibleName(const string16& name) {
   accessible_name_ = name;
 }
@@ skipping 83 matching lines @@
 
 void Textfield::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_TEXT;
   state->name = accessible_name_;
   if (read_only())
     state->state |= ui::AccessibilityTypes::STATE_READONLY;
   if (IsObscured())
     state->state |= ui::AccessibilityTypes::STATE_PROTECTED;
   state->value = text_;
 
-  const ui::Range range = native_wrapper_->GetSelectedRange();
+  const gfx::Range range = native_wrapper_->GetSelectedRange();
   state->selection_start = range.start();
   state->selection_end = range.end();
 
   if (!read_only()) {
     state->set_value_callback =
         base::Bind(&Textfield::AccessibilitySetValue,
                    weak_ptr_factory_.GetWeakPtr());
   }
 }
 
@@ skipping 60 matching lines @@
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   if (!Textfield::IsViewsTextfieldEnabled())
     return new NativeTextfieldWin(field);
 #endif
   return new NativeTextfieldViews(field);
 }
 
 }  // namespace views