Merge NativeTextfieldViews into views::Textfield.

ui/views/controls/textfield/textfield_views_model.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_
 
 #include <list>
 #include <vector>
 
@@ skipping 208 matching lines @@
 
   // Removes current composition text.
   void CancelCompositionText();
 
   // Retrieves the range of current composition text.
   void GetCompositionTextRange(gfx::Range* range) const;
 
   // Returns true if there is composition text.
   bool HasCompositionText() const;
 
+  // Clears all edit history.
+  void ClearEditHistory();
+
  private:
-  friend class NativeTextfieldViews;
-  friend class NativeTextfieldViewsTest;
   friend class TextfieldViewsModelTest;
   friend class UndoRedo_BasicTest;
   friend class UndoRedo_CutCopyPasteTest;
   friend class UndoRedo_ReplaceTest;
   friend class internal::Edit;
 
   FRIEND_TEST_ALL_PREFIXES(TextfieldViewsModelTest, UndoRedo_BasicTest);
   FRIEND_TEST_ALL_PREFIXES(TextfieldViewsModelTest, UndoRedo_CutCopyPasteTest);
   FRIEND_TEST_ALL_PREFIXES(TextfieldViewsModelTest, UndoRedo_ReplaceTest);
 
   // Insert the given |text|. |mergeable| indicates if this insert
   // operation can be merged to previous edit in the edit history.
   void InsertTextInternal(const base::string16& text, bool mergeable);
 
   // Replace the current text with the given |text|. |mergeable|
   // indicates if this replace operation can be merged to previous
   // edit in the edit history.
   void ReplaceTextInternal(const base::string16& text, bool mergeable);
 
-  // Clears all edit history.
-  void ClearEditHistory();
-
   // Clears redo history.
   void ClearRedoHistory();
 
   // Executes and records edit operations.
   void ExecuteAndRecordDelete(gfx::Range range, bool mergeable);
   void ExecuteAndRecordReplaceSelection(internal::MergeType merge_type,
                                         const base::string16& text);
   void ExecuteAndRecordReplace(internal::MergeType merge_type,
                                size_t old_cursor_pos,
                                size_t new_cursor_pos,
@@ skipping 40 matching lines @@
   // 2) new edit is added. (redo history is cleared)
   // 3) redone all undone edits.
   EditHistory::iterator current_edit_;
 
   DISALLOW_COPY_AND_ASSIGN(TextfieldViewsModel);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_VIEWS_MODEL_H_