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

views/controls/textfield/textfield.h

Index: views/controls/textfield/textfield.h
diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h
index 9a688fc7bd8246ab8f59b25b04d305780ad4b787..4f28aaa857e91b6fdc9a1f869dda3a39fbac9453 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -74,8 +74,13 @@ class Textfield : public View {
   // 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.
@@ -209,6 +214,9 @@ class Textfield : public View {
   // wrapper is created.
   void ClearAllTextStyles();
 
+  // Clears Edit history.
+  void ClearEditHistory();
+
   // Set the accessible name of the text field.
   void SetAccessibleName(const string16& name);