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..e80a622f65a213bad3670f7ceb2030e5c4e1fd37 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
+  // out of the new text's range.
   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);