Add TextRange and related methods to Textfield Views.

views/controls/textfield/textfield_views_model.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
 #pragma once
 
 #include <vector>
 
 #include "base/string16.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace gfx {
 class Font;
 }  // namespace gfx
 
 namespace views {
 
+class TextRange;
+
 // A model that represents a text content for TextfieldViews.
 // It supports editing, selection and cursor manipulation.
 class TextfieldViewsModel {
  public:
   TextfieldViewsModel();
   virtual ~TextfieldViewsModel();
 
   // Text fragment info. Used to draw selected text.
   // We may replace this with TextAttribute class
   // in the future to support multi-color text
@@ skipping 76 matching lines @@
   bool MoveCursorTo(size_t position, bool select);
 
   // Returns the bounds of character at the current cursor.
   gfx::Rect GetCursorBounds(const gfx::Font& font) const;
 
   // Selection related method
 
   // Returns the selected text.
   string16 GetSelectedText() const;
 
+  void GetSelectedRange(TextRange* range) const;
+
+  void SelectRange(const TextRange& range);
+
   // Selects all text.
   void SelectAll();
 
   // Clears selection.
   void ClearSelection();
 
   // Returns visible text. If the field is password, it returns the
   // sequence of "*".
   string16 GetVisibleText() const {
     return GetVisibleText(0U, text_.length());
@@ skipping 15 matching lines @@
 
  private:
   friend class NativeTextfieldViews;
 
   // Deletes the selected text.
   void DeleteSelection();
 
   // Returns the visible text given |start| and |end|.
   string16 GetVisibleText(size_t start, size_t end) const;
 
+  // Returns the normalized cursor position that does not exceed the
+  // text length.
+  size_t SafePosition(size_t position) const;

[Ben Goodger (Google), 2011/01/19 16:40:16]

GetSafePosition for consistency?

[oshima, 2011/01/19 18:22:52]

Done.

+
   // The text in utf16 format.
   string16 text_;
 
   // Current cursor position.
   size_t cursor_pos_;
 
   // Selection range.
   size_t selection_begin_;
 
   // True if the text is the password.
   bool is_password_;
 
   DISALLOW_COPY_AND_ASSIGN(TextfieldViewsModel);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_