Merge gesture deletion and selection.

ui/keyboard/keyboard_switches.h

Index: ui/keyboard/keyboard_switches.h
diff --git a/ui/keyboard/keyboard_switches.h b/ui/keyboard/keyboard_switches.h
index f036161d9ec585cb0dc349e22c3b7a28b8b3cec2..d9296ca01036075f4327c92239a8639f1b3d9efe 100644
--- a/ui/keyboard/keyboard_switches.h
+++ b/ui/keyboard/keyboard_switches.h
@@ -39,23 +39,15 @@ KEYBOARD_EXPORT extern const char kGestureTypingEnabled[];
 // Disables gesture typing for the virtual keyboard.
 KEYBOARD_EXPORT extern const char kGestureTypingDisabled[];
 
-// Gesture selection for the virtual keyboard.
-KEYBOARD_EXPORT extern const char kGestureSelection[];
+// Controls the appearance of the settings option to enable gesture editing
+// for the virtual keyboard.
+KEYBOARD_EXPORT extern const char kGestureEditing[];
 
-// Enables gesture selection for the virtual keyboard.
-KEYBOARD_EXPORT extern const char kGestureSelectionEnabled[];
+// Enables gesture editing for the virtual keyboard.
+KEYBOARD_EXPORT extern const char kGestureEditingEnabled[];
 
-// Disables gesture selection for the virtual keyboard.
-KEYBOARD_EXPORT extern const char kGestureSelectionDisabled[];
-
-// Gesture deletion for the virtual keyboard.
-KEYBOARD_EXPORT extern const char kGestureDeletion[];
-
-// Enables gesture deletion for the virtual keyboard.
-KEYBOARD_EXPORT extern const char kGestureDeletionEnabled[];
-
-// Disables gesture deletion for the virtual keyboard.
-KEYBOARD_EXPORT extern const char kGestureDeletionDisabled[];
+// Disables gesture editing for the virtual keyboard.
+KEYBOARD_EXPORT extern const char kGestureEditingDisabled[];
 
 // Enables the virtual keyboard.
 KEYBOARD_EXPORT extern const char kEnableVirtualKeyboard[];