Revert 196446 "Make touch drag drop and touch editing flags tri-..."

trunk/src/ui/views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2013 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/native_textfield_views.h"
 
 #include <algorithm>
 #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"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_locale_settings.h"
 #include "grit/ui_strings.h"
 #include "third_party/icu/public/common/unicode/uchar.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #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_util.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/menu/menu_item_view.h"
@@ skipping 156 matching lines @@
       if (!GetRenderText()->IsPointInSelection(event->location())) {
         OnBeforeUserAction();
         model_->SelectWord();
         touch_selection_controller_.reset(
             ui::TouchSelectionController::create(this));
         OnCaretBoundsChanged();
         SchedulePaint();
         OnAfterUserAction();
         if (touch_selection_controller_.get())
           event->SetHandled();
-      } else if (switches::IsTouchDragDropEnabled()) {
+      } else if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableTouchDragDrop)) {
         touch_selection_controller_.reset();
       } else {
         if (!touch_selection_controller_.get())
           CreateTouchSelectionControllerAndNotifyIt();
         if (touch_selection_controller_.get())
           event->SetHandled();
       }
       return;
     case ui::ET_GESTURE_LONG_TAP:
       if (!touch_selection_controller_.get())
@@ skipping 1215 matching lines @@
 
 void NativeTextfieldViews::PlatformGestureEventHandling(
     const ui::GestureEvent* event) {
 #if defined(OS_WIN) && defined(USE_AURA)
   if (event->type() == ui::ET_GESTURE_TAP_DOWN && !textfield_->read_only())
     base::win::DisplayVirtualKeyboard();
 #endif
 }
 
 }  // namespace views