| commit | 1400e6dc12c13f62aa300dd4468019a08388daec | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Sat Apr 27 02:36:27 2013 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Sat Apr 27 02:36:27 2013 |
| tree | 250c21e5168f550b0a7d3bf16323f5a88a4efb11 | |
| parent | cd88f791eacd3f59a83af0fe1713db55ed03a352 [diff] [blame] |
Reland https://chromiumcodereview.appspot.com/14286004 which was reverted fue to linux_chromeos_asan build break. The cause of the break has since been fixed in https://codereview.chromium.org/14113034/ There are no additional changes from the original CL. BUG=115237,168162 [email protected],[email protected] Review URL: https://chromiumcodereview.appspot.com/14283013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196927 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/base/ui_base_switches.cc b/ui/base/ui_base_switches.cc index 80fcb0a..5575f274 100644 --- a/ui/base/ui_base_switches.cc +++ b/ui/base/ui_base_switches.cc
@@ -12,6 +12,12 @@ // 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"; @@ -21,6 +27,7 @@ // 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.