Remove new dialog style command-line flags, etc.

ui/views/controls/textfield/textfield.cc

 // 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.
 
 #include "ui/views/controls/textfield/textfield.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/range/range.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches.h"
-#include "ui/base/ui_base_switches_util.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/selection_model.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/controls/textfield/native_textfield_wrapper.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 25 matching lines @@
 const char Textfield::kViewClassName[] = "Textfield";
 
 // static
 bool Textfield::IsViewsTextfieldEnabled() {
 #if defined(OS_WIN) && !defined(USE_AURA)
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDisableViewsTextfield))
     return false;
   if (command_line->HasSwitch(switches::kEnableViewsTextfield))
     return true;
-  // The new dialog style cannot host native Windows textfield controls.
-  if (switches::IsNewDialogStyleEnabled())
-    return true;
   // Avoid native Windows Textfields if the RichEdit library is not available.
   static const HMODULE loaded_msftedit_dll = LoadLibrary(L"msftedit.dll");
   if (!loaded_msftedit_dll)
     return true;
 #endif
   return true;
 }
 
 Textfield::Textfield()
     : native_wrapper_(NULL),
@@ skipping 483 matching lines @@
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   if (!Textfield::IsViewsTextfieldEnabled())
     return new NativeTextfieldWin(field);
 #endif
   return new NativeTextfieldViews(field);
 }
 
 }  // namespace views