views::Textfield: Implement yank editing command.

ui/views/controls/textfield/textfield_model.h

 // Copyright 2014 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_MODEL_H_
 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_MODEL_H_
 
 #include <stddef.h>
 
 #include <list>
@@ skipping 19 matching lines @@
   // The edit should not usually be merged with next edit.
   DO_NOT_MERGE,
   // The edit should be merged with next edit when possible.
   MERGEABLE,
   // The edit should be merged with the prior edit, even if marked DO_NOT_MERGE.
   FORCE_MERGE,
 };
 
 }  // namespace internal
 
+namespace test {
+class BridgedNativeWidgetTest;
+}  // namsespace test
+
 // A model that represents text content for a views::Textfield.
 // It supports editing, selection and cursor manipulation.
 class VIEWS_EXPORT TextfieldModel {
  public:
   // Delegate interface implemented by the textfield view class to provide
   // additional functionalities required by the model.
   class VIEWS_EXPORT Delegate {
    public:
     // Called when the current composition text is confirmed or cleared.
     virtual void OnCompositionTextConfirmedOrCleared() = 0;
@@ skipping 38 matching lines @@
   void ReplaceChar(base::char16 c) {
     ReplaceTextInternal(base::string16(&c, 1), true);
   }
 
   // Appends the text.
   // The current composition text will be confirmed.
   void Append(const base::string16& new_text);
 
   // Deletes the first character after the current cursor position (as if, the
   // the user has pressed delete key in the textfield). Returns true if
-  // the deletion is successful.
+  // the deletion is successful. If |add_to_kill_buffer| is true, the deleted
+  // text is copied to the kill buffer.
   // If there is composition text, it'll be deleted instead.
-  bool Delete();
+  bool Delete(bool add_to_kill_buffer = false);
 
   // Deletes the first character before the current cursor position (as if, the
   // the user has pressed backspace key in the textfield). Returns true if
-  // the removal is successful.
+  // the removal is successful. If |add_to_kill_buffer| is true, the deleted
+  // text is copied to the kill buffer.
   // If there is composition text, it'll be deleted instead.
-  bool Backspace();
+  bool Backspace(bool add_to_kill_buffer = false);
 
   // Cursor related methods.
 
   // Returns the current cursor position.
   size_t GetCursorPosition() const;
 
   // Moves the cursor, see RenderText for additional details.
   // The current composition text will be confirmed.
   void MoveCursor(gfx::BreakType break_type,
                   gfx::VisualCursorDirection direction,
@@ skipping 58 matching lines @@
 
   // Pastes text from the clipboard at current cursor position. Returns true
   // if any text is pasted.
   bool Paste();
 
   // Transposes the characters to either side of the insertion point and
   // advances the insertion point past both of them. Returns true if text is
   // changed.
   bool Transpose();
 
+  // Pastes text from the kill buffer at the current cursor position. Returns
+  // true if the text has changed after yanking.
+  bool Yank();
+
   // Tells if any text is selected, even if the selection is in composition
   // text.
   bool HasSelection() const;
 
   // Deletes the selected text. This method shouldn't be called with
   // composition text.
   void DeleteSelection();
 
   // Deletes the selected text (if any) and insert text at given position.
   void DeleteSelectionAndInsertTextAt(const base::string16& new_text,
@@ skipping 23 matching lines @@
   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 internal::Edit;
+  friend class test::BridgedNativeWidgetTest;
+  friend class TextfieldModelTest;
+  friend class TextfieldTest;
 
   FRIEND_TEST_ALL_PREFIXES(TextfieldModelTest, UndoRedo_BasicTest);
   FRIEND_TEST_ALL_PREFIXES(TextfieldModelTest, UndoRedo_CutCopyPasteTest);
   FRIEND_TEST_ALL_PREFIXES(TextfieldModelTest, UndoRedo_ReplaceTest);
 
   // Insert the given |new_text|. |mergeable| indicates if this insert operation
   // can be merged with previous edits in the history.
   void InsertTextInternal(const base::string16& new_text, bool mergeable);
 
   // Replace the current text with the given |new_text|. |mergeable| indicates
@@ skipping 24 matching lines @@
   //    Note that the index is after deletion.
   // 3) Move the cursor to |new_cursor_pos|.
   void ModifyText(size_t delete_from,
                   size_t delete_to,
                   const base::string16& new_text,
                   size_t new_text_insert_at,
                   size_t new_cursor_pos);
 
   void ClearComposition();
 
+  // Clears the kill buffer. Used to clear global state between tests.
+  static void ClearKillBuffer();
+
   // The TextfieldModel::Delegate instance should be provided by the owner.
   Delegate* delegate_;
 
   // The stylized text, cursor, selection, and the visual layout model.
   std::unique_ptr<gfx::RenderText> render_text_;
 
   // The composition range.
   gfx::Range composition_range_;
 
   typedef std::list<internal::Edit*> EditHistory;
@@ skipping 12 matching lines @@
   //   2) new edit is added. (redo history is cleared)
   //   3) redone all undone edits.
   EditHistory::iterator current_edit_;
 
   DISALLOW_COPY_AND_ASSIGN(TextfieldModel);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_MODEL_H_