An edit for SetText needs to be merged with previous edit for omnibox.

views/controls/textfield/textfield.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_H_
 #define VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 #pragma once
 
 #include "build/build_config.h"
 
@@ skipping 56 matching lines @@
   void SetReadOnly(bool read_only);
 
   // Gets/Sets whether or not this Textfield is a password field.
   bool IsPassword() const;
   void SetPassword(bool password);
 
   // Whether the text field is multi-line or not, must be set when the text
   // field is created, using StyleFlags.
   bool IsMultiLine() const;
 
-  // Gets/Sets the text currently displayed in the Textfield.
+  // Gets the text currently displayed in the Textfield.
   const string16& text() const { return text_; }
+
+  // Sets the text currently displayed in the Textfield.  This doesn't
+  // change the cursor position if the current cursor is within the
+  // new text's range, or moves the cursor to the end if the cursor is
+  // our of range.

[msw, 2011/06/02 10:16:42]

'is ou*t* of *the new text's* range'? Perhaps just say "The cursor position is
clipped to the new text range, but otherwise unchanged." or similar.

[oshima, 2011/06/02 19:11:42]

Done.

   void SetText(const string16& text);
 
   // Appends the given string to the previously-existing text in the field.
   void AppendText(const string16& text);
 
   // Returns the text that is currently selected.
   string16 GetSelectedText() const;
 
   // Causes the edit field to be fully selected.
   void SelectAll();
@@ skipping 113 matching lines @@
   // be ignored if range is empty or invalid.  This is
   // views-implementation only and has to be called after the wrapper
   // is created.
   void ApplyTextStyle(const TextStyle* style, const ui::Range& range);
 
   // Clears All TextStyles.
   // This is views-implementation only and has to be called after the
   // wrapper is created.
   void ClearAllTextStyles();
 
+  // Clears Edit history.
+  void ClearEditHistory();
+
   // Set the accessible name of the text field.
   void SetAccessibleName(const string16& name);
 
 #ifdef UNIT_TEST
   gfx::NativeView GetTestingHandle() const {
     return native_wrapper_ ? native_wrapper_->GetTestingHandle() : NULL;
   }
   NativeTextfieldWrapper* native_wrapper() const {
     return native_wrapper_;
   }
@@ skipping 83 matching lines @@
 
   // The accessible name of the text field.
   string16 accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(Textfield);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_