Remove unused multiline attribute in textfield

views/controls/textfield/native_textfield_win.cc

 // Copyright (c) 2011 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 "views/controls/textfield/native_textfield_win.h"
 
 #include <algorithm>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
@@ skipping 81 matching lines @@
       can_discard_mousemove_(false),
       contains_mouse_(false),
       ime_discard_composition_(false),
       ime_composition_start_(0),
       ime_composition_length_(0),
       container_view_(new NativeViewHost),
       bg_color_(0) {
   if (!did_load_library_)
     did_load_library_ = !!LoadLibrary(L"riched20.dll");
 
-  DWORD style = kDefaultEditStyle;
+  DWORD style = kDefaultEditStyle | ES_AUTOHSCROLL;
   if (textfield_->style() & Textfield::STYLE_PASSWORD)
     style |= ES_PASSWORD;
 
   if (textfield_->read_only())
     style |= ES_READONLY;
 
-  if (textfield_->style() & Textfield::STYLE_MULTILINE)
-    style |= ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL;
-  else
-    style |= ES_AUTOHSCROLL;
   // Make sure we apply RTL related extended window styles if necessary.
   DWORD ex_style = l10n_util::GetExtendedStyles();
 
   RECT r = {0, 0, textfield_->width(), textfield_->height()};
   Create(textfield_->GetWidget()->GetNativeView(), r, NULL, style, ex_style);
 
   if (textfield_->style() & Textfield::STYLE_LOWERCASE) {
     DCHECK((textfield_->style() & Textfield::STYLE_PASSWORD) == 0);
     SetEditStyle(SES_LOWERCASE, SES_LOWERCASE);
   }
@@ skipping 504 matching lines @@
   textfield_->SyncText();
   return DefWindowProc(message, wparam, lparam);
 }
 
 void NativeTextfieldWin::OnKeyDown(TCHAR key, UINT repeat_count, UINT flags) {
   // NOTE: Annoyingly, ctrl-alt-<key> generates WM_KEYDOWN rather than
   // WM_SYSKEYDOWN, so we need to check (flags & KF_ALTDOWN) in various places
   // 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
     // they go through our clipboard routines.  This allows us to be smarter
     // about how we interact with the clipboard and avoid bugs in the
     // CRichEditCtrl.  If we didn't hijack here, the edit control would handle
     // these internally with sending the WM_CUT, WM_COPY, or WM_PASTE messages.
     //
     // Cut:   Shift-Delete and Ctrl-x are treated as cut.  Ctrl-Shift-Delete and
     //        Ctrl-Shift-x are not treated as cut even though the underlying
@@ skipping 509 matching lines @@
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   if (NativeTextfieldViews::IsTextfieldViewsEnabled()) {
     return new NativeTextfieldViews(field);
   } else {
     return new NativeTextfieldWin(field);
   }
 }
 
 }  // namespace views