| Index: ui/views/controls/textfield/native_textfield_views.cc
|
| diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc
|
| index f216355a0358bad7fc45d304f0ea854d491172ad..59ea6297b24b77655533e679832296f168a9e260 100644
|
| --- a/ui/views/controls/textfield/native_textfield_views.cc
|
| +++ b/ui/views/controls/textfield/native_textfield_views.cc
|
| @@ -8,7 +8,6 @@
|
| #include <set>
|
|
|
| #include "base/bind.h"
|
| -#include "base/command_line.h"
|
| #include "base/debug/trace_event.h"
|
| #include "base/i18n/case_conversion.h"
|
| #include "base/logging.h"
|
| @@ -24,7 +23,7 @@
|
| #include "ui/base/events/event.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/range/range.h"
|
| -#include "ui/base/ui_base_switches.h"
|
| +#include "ui/base/ui_base_switches_util.h"
|
| #include "ui/compositor/layer.h"
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/insets.h"
|
| @@ -201,8 +200,7 @@ void NativeTextfieldViews::OnGestureEvent(ui::GestureEvent* event) {
|
| OnAfterUserAction();
|
| if (touch_selection_controller_.get())
|
| event->SetHandled();
|
| - } else if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableTouchDragDrop)) {
|
| + } else if (switches::IsTouchDragDropEnabled()) {
|
| touch_selection_controller_.reset();
|
| } else {
|
| if (!touch_selection_controller_.get())
|
|
|