Reland https://chromiumcodereview.appspot.com/14286004 which was reverted fue

ui/base/ui_base_switches.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/base/ui_base_switches.h"
 
 namespace switches {
 
 // Disables use of DWM composition for top level windows.
 const char kDisableDwmComposition[] = "disable-dwm-composition";
 
 // Disables touch adjustment.
 const char kDisableTouchAdjustment[] = "disable-touch-adjustment";
 
+// Disables touch event based drag and drop.
+const char kDisableTouchDragDrop[] = "disable-touch-drag-drop";
+
+// Disables controls that support touch base text editing.
+const char kDisableTouchEditing[] = "disable-touch-editing";
+
 // Disables the Views textfield on Windows.
 const char kDisableViewsTextfield[] = "disable-views-textfield";
 
 // Enables support for bezel touch.
 const char kEnableBezelTouch[] = "enable-bezel-touch";
 
 // Enables the new dialog style wherever it is available.
 const char kEnableNewDialogStyle[] = "enable-new-dialog-style";
 
+// Enables touch event based drag and drop.
 const char kEnableTouchDragDrop[] = "enable-touch-drag-drop";
 
 // Enables controls that support touch base text editing.
 const char kEnableTouchEditing[] = "enable-touch-editing";
 
 // Enables the Views textfield on Windows.
 const char kEnableViewsTextfield[] = "enable-views-textfield";
 
 // Overrides the device scale factor for the browser UI and the contents.
 const char kForceDeviceScaleFactor[] = "force-device-scale-factor";
@@ skipping 56 matching lines @@
 #endif
 
 #if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
 // Tells chrome to interpret events from these devices as touch events. Only
 // available with XInput 2 (i.e. X server 1.8 or above). The id's of the
 // devices can be retrieved from 'xinput list'.
 const char kTouchDevices[] = "touch-devices";
 #endif
 
 }  // namespace switches