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

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 <list>
 #include <vector>
@@ skipping 16 matching lines @@
 
 class TextStyle;
 typedef std::vector<TextStyle*> TextStyles;
 
 namespace internal {
 // Internal Edit class that keeps track of edits for undo/redo.
 class Edit;
 
 struct TextStyleRange;
 
+// C++ doesn't allow forward decl enum, so let's define here.
+enum MergeType {
+  DONT_MERGE,

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

nit: rename DO_NOT_MERGE, the DONT contraction without its apostrophe is ugly.

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

Done.

+  MERGEABLE,
+  MERGE_WITH_PREVIOUS,
+};
+
 }  // namespace internal
 
 typedef std::vector<internal::TextStyleRange*> TextStyleRanges;
 
 // A model that represents a text content for TextfieldViews.
 // It supports editing, selection and cursor manipulation.
 class TextfieldViewsModel {
  public:
 
   // Delegate interface implemented by the textfield view class to provided
@@ skipping 259 matching lines @@
   void ReplaceTextInternal(const string16& text, bool mergeable);
 
   // Clears all edit history.
   void ClearEditHistory();
 
   // Clears redo history.
   void ClearRedoHistory();
 
   // Executes and records edit operations.
   void ExecuteAndRecordDelete(size_t from, size_t to, bool mergeable);
-  void ExecuteAndRecordReplace(const string16& text, bool mergeable);
-  void ExecuteAndRecordReplaceAt(const string16& text,
-                                 size_t at,
-                                 bool mergeable);
+  void ExecuteAndRecordReplaceSelection(internal::MergeType merge_type,
+                                        const string16& text);
+  void ExecuteAndRecordReplace(internal::MergeType merge_type,
+                               size_t old_cursor_pos,
+                               size_t new_cursor_pos,
+                               const string16& text,
+                               size_t new_text_start);
   void ExecuteAndRecordInsert(const string16& text, bool mergeable);
 
   // Adds or merge |edit| into edit history. Return true if the edit
   // has been merged and must be deleted after redo.
   bool AddOrMergeEditHistory(internal::Edit* edit);
 
   // Modify the text buffer in following way:
   // 1) Delete the string from |delete_from| to |delte_to|.
   // 2) Insert the |new_text| at the index |new_text_insert_at|.
   //    Note that the index is after deletion.
@@ skipping 58 matching lines @@
 
   // List of style ranges for composition text.
   TextStyleRanges composition_style_ranges_;
 
   DISALLOW_COPY_AND_ASSIGN(TextfieldViewsModel);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_