Don't merge replace edit if previous edit is delete edit.

Don't merge replace edit if previous edit is delete edit.
Enable UndoRedo_CutCopyPasteTest

BUG=103988, 97845
TEST=added new UndoRedo_BackspaceThenSetText, enabled CutCopyPasteTest


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113525

[msw, 2011-12-07 00:55:21]

Interesting, the bug comments indicate that new_text_ was uninitialized or not
set properly. Can you explain what's going wrong and how this fixes it?

http://codereview.chromium.org/8823007/diff/1/ui/views/controls/textfield/tex...
File ui/views/controls/textfield/textfield_views_model.cc (right):

http://codereview.chromium.org/8823007/diff/1/ui/views/controls/textfield/tex...
ui/views/controls/textfield/textfield_views_model.cc:61: if (type_ !=
DELETE_EDIT && edit->merge_with_previous()) {
Interesting, please comment why DELETE_EDIT doesn't work here.

http://codereview.chromium.org/8823007/diff/1/ui/views/controls/textfield/tex...
File ui/views/controls/textfield/textfield_views_model_unittest.cc (right):

http://codereview.chromium.org/8823007/diff/1/ui/views/controls/textfield/tex...
ui/views/controls/textfield/textfield_views_model_unittest.cc:1191:
model.SetText(ASCIIToUTF16("www.google.com"));  // confirm the text.
nit: Captialize 'Confirm'.

http://codereview.chromium.org/8823007/diff/1/ui/views/controls/textfield/tex...
ui/views/controls/textfield/textfield_views_model_unittest.cc:1197: //
autocomplete sets the text
nit: Captialize 'Autocomplete'.

[oshima, 2011-12-07 01:17:24]

http://codereview.chromium.org/8823007/diff/1/ui/views/controls/textfield/tex...
File ui/views/controls/textfield/textfield_views_model.cc (right):

http://codereview.chromium.org/8823007/diff/1/ui/views/controls/textfield/tex...
ui/views/controls/textfield/textfield_views_model.cc:61: if (type_ !=
DELETE_EDIT && edit->merge_with_previous()) {
On 2011/12/07 00:55:22, msw wrote:
> Interesting, please comment why DELETE_EDIT doesn't work here.

Done. I also improved the test to make this point clear.

http://codereview.chromium.org/8823007/diff/1/ui/views/controls/textfield/tex...
File ui/views/controls/textfield/textfield_views_model_unittest.cc (right):

http://codereview.chromium.org/8823007/diff/1/ui/views/controls/textfield/tex...
ui/views/controls/textfield/textfield_views_model_unittest.cc:1191:
model.SetText(ASCIIToUTF16("www.google.com"));  // confirm the text.
On 2011/12/07 00:55:22, msw wrote:
> nit: Captialize 'Confirm'.

Done.

http://codereview.chromium.org/8823007/diff/1/ui/views/controls/textfield/tex...
ui/views/controls/textfield/textfield_views_model_unittest.cc:1197: //
autocomplete sets the text
On 2011/12/07 00:55:22, msw wrote:
> nit: Captialize 'Autocomplete'.

Done.

[msw, 2011-12-07 01:23:35]

Awesome, thanks for clarifying. LGTM with nits.

http://codereview.chromium.org/8823007/diff/5001/ui/views/controls/textfield/...
File ui/views/controls/textfield/textfield_views_model.cc (right):

http://codereview.chromium.org/8823007/diff/5001/ui/views/controls/textfield/...
ui/views/controls/textfield/textfield_views_model.cc:62: // user deletes
characters then hit return.  In this case, the delete
nit: "hits".
optional nit: Other comments use one space after periods.

[oshima, 2011-12-07 01:26:20]

http://codereview.chromium.org/8823007/diff/5001/ui/views/controls/textfield/...
File ui/views/controls/textfield/textfield_views_model.cc (right):

http://codereview.chromium.org/8823007/diff/5001/ui/views/controls/textfield/...
ui/views/controls/textfield/textfield_views_model.cc:62: // user deletes
characters then hit return.  In this case, the delete
On 2011/12/07 01:23:35, msw wrote:
> nit: "hits".
> optional nit: Other comments use one space after periods.

Done.

[commit-bot: I haz the power, 2011-12-07 01:26:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/8823007/4005

[commit-bot: I haz the power, 2011-12-07 01:26:51]

Presubmit check for 8823007-4005 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
Missing LGTM from an OWNER for:
ui/views/controls/textfield/textfield_views_model.cc,ui/views/controls/textfield/textfield_views_model_unittest.cc

[oshima, 2011-12-07 03:36:03]

ben can you approve this?

[Ben Goodger (Google), 2011-12-07 22:34:11]

lgtm

[commit-bot: I haz the power, 2011-12-07 23:32:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/8823007/4005

[commit-bot: I haz the power, 2011-12-08 01:41:18]

Change committed as 113525