Merge NativeTextfieldViews into views::Textfield.

ui/views/controls/textfield/textfield_views_model.cc

 // Copyright (c) 2012 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.
 
 #include "ui/views/controls/textfield/textfield_views_model.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
@@ skipping 634 matching lines @@
 }
 
 void TextfieldViewsModel::GetCompositionTextRange(gfx::Range* range) const {
   *range = gfx::Range(render_text_->GetCompositionRange());
 }
 
 bool TextfieldViewsModel::HasCompositionText() const {
   return !render_text_->GetCompositionRange().is_empty();
 }
 
+void TextfieldViewsModel::ClearEditHistory() {
+  STLDeleteElements(&edit_history_);
+  current_edit_ = edit_history_.end();
+}
+
 /////////////////////////////////////////////////////////////////
 // TextfieldViewsModel: private
 
 void TextfieldViewsModel::InsertTextInternal(const base::string16& text,
                                              bool mergeable) {
   if (HasCompositionText()) {
     CancelCompositionText();
     ExecuteAndRecordInsert(text, mergeable);
   } else if (HasSelection()) {
     ExecuteAndRecordReplaceSelection(mergeable ? MERGEABLE : DO_NOT_MERGE,
@@ skipping 16 matching lines @@
         render_text_->IndexOfAdjacentGrapheme(cursor, gfx::CURSOR_FORWARD);
     if (next == model.caret_pos())
       render_text_->MoveCursorTo(model);
     else
       render_text_->SelectRange(gfx::Range(next, model.caret_pos()));
   }
   // Edit history is recorded in InsertText.
   InsertTextInternal(text, mergeable);
 }
 
-void TextfieldViewsModel::ClearEditHistory() {
-  STLDeleteElements(&edit_history_);
-  current_edit_ = edit_history_.end();
-}
-
 void TextfieldViewsModel::ClearRedoHistory() {
   if (edit_history_.begin() == edit_history_.end())
     return;
   if (current_edit_ == edit_history_.end()) {
     ClearEditHistory();
     return;
   }
   EditHistory::iterator delete_start = current_edit_;
   delete_start++;
   STLDeleteContainerPointers(delete_start, edit_history_.end());
@@ skipping 86 matching lines @@
   if (delete_from != delete_to)
     render_text_->SetText(text.erase(delete_from, delete_to - delete_from));
   if (!new_text.empty())
     render_text_->SetText(text.insert(new_text_insert_at, new_text));
   render_text_->SetCursorPosition(new_cursor_pos);
   // TODO(oshima): mac selects the text that is just undone (but gtk doesn't).
   // This looks fine feature and we may want to do the same.
 }
 
 }  // namespace views