Clean up of SelectionModel

views/controls/textfield/textfield.cc

 // Copyright (c) 2011 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 "views/controls/textfield/textfield.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdkkeysyms.h>
 #endif
 
@@ skipping 140 matching lines @@
     return native_wrapper_->GetSelectedText();
   return string16();
 }
 
 void Textfield::ClearSelection() const {
   if (native_wrapper_)
     native_wrapper_->ClearSelection();
 }
 
 bool Textfield::HasSelection() const {
-  gfx::SelectionModel sel;
+  ui::Range range;
   if (native_wrapper_)
-    native_wrapper_->GetSelectionModel(&sel);
-  return sel.selection_start() != sel.selection_end();
+    native_wrapper_->GetSelectedRange(&range);
+  return !range.is_empty();
 }
 
 void Textfield::SetTextColor(SkColor color) {
   text_color_ = color;
   use_default_text_color_ = false;
   if (native_wrapper_)
     native_wrapper_->UpdateTextColor();
 }
 
 void Textfield::UseDefaultTextColor() {
@@ skipping 86 matching lines @@
       if (controller_)
         controller_->ContentsChanged(this, text_);
     }
   }
 }
 
 bool Textfield::IsIMEComposing() const {
   return native_wrapper_ && native_wrapper_->IsIMEComposing();
 }
 
+void Textfield::GetSelectedRange(ui::Range* range) const {
+  DCHECK(native_wrapper_);
+  native_wrapper_->GetSelectedRange(range);
+}
+
+void Textfield::SelectRange(const ui::Range& range) {
+  DCHECK(native_wrapper_);
+  native_wrapper_->SelectRange(range);
+}
+
 void Textfield::GetSelectionModel(gfx::SelectionModel* sel) const {
   DCHECK(native_wrapper_);
   native_wrapper_->GetSelectionModel(sel);
 }
 
 void Textfield::SelectSelectionModel(const gfx::SelectionModel& sel) {
   DCHECK(native_wrapper_);
   native_wrapper_->SelectSelectionModel(sel);
 }
 
@@ skipping 106 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 (IsPassword())
     state->state |= ui::AccessibilityTypes::STATE_PROTECTED;
   state->value = text_;
 
   DCHECK(native_wrapper_);
-  gfx::SelectionModel sel;
-  native_wrapper_->GetSelectionModel(&sel);
-  state->selection_start = sel.selection_start();
-  state->selection_end = sel.selection_end();
+  ui::Range range;
+  native_wrapper_->GetSelectedRange(&range);
+  state->selection_start = range.start();
+  state->selection_end = range.end();
 }
 
 TextInputClient* Textfield::GetTextInputClient() {
   return native_wrapper_ ? native_wrapper_->GetTextInputClient() : NULL;
 }
 
 void Textfield::OnEnabledChanged() {
   View::OnEnabledChanged();
   if (native_wrapper_)
     native_wrapper_->UpdateEnabled();
@@ skipping 23 matching lines @@
     }
 #endif
   }
 }
 
 std::string Textfield::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views