| Index: views/controls/textfield/native_textfield_win.cc
|
| diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
|
| index b59e168f61a12313235b5b2ebe449e5ca42f7d95..d2ae776fab2a7c4b458ad631dcefaf3ccdb2785e 100644
|
| --- a/views/controls/textfield/native_textfield_win.cc
|
| +++ b/views/controls/textfield/native_textfield_win.cc
|
| @@ -616,13 +616,11 @@ void NativeTextfieldWin::OnKeyDown(TCHAR key, UINT repeat_count, UINT flags) {
|
| // in this function even with a WM_SYSKEYDOWN handler.
|
|
|
| switch (key) {
|
| +
|
| + // Ignore Return
|
| case VK_RETURN:
|
| - // If we are multi-line, we want to let returns through so they start a
|
| - // new line.
|
| - if (textfield_->IsMultiLine())
|
| - break;
|
| - else
|
| - return;
|
| + return;
|
| +
|
| // Hijacking Editing Commands
|
| //
|
| // We hijack the keyboard short-cuts for Cut, Copy, and Paste here so that
|
|
|