Merge gesture deletion and selection.

ui/keyboard/keyboard_switches.h

 // 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.
 
 #ifndef UI_KEYBOARD_KEYBOARD_SWITCHES_H_
 #define UI_KEYBOARD_KEYBOARD_SWITCHES_H_
 
 #include "ui/keyboard/keyboard_export.h"
 
 namespace keyboard {
@@ skipping 21 matching lines @@
 
 // Gesture typing flag for the virtual keyboard.
 KEYBOARD_EXPORT extern const char kGestureTyping[];
 
 // Enables gesture typing for the virtual keyboard.
 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[];
 
 // Floating virtual keyboard flag.
 KEYBOARD_EXPORT extern const char kFloatingVirtualKeyboard[];
 
 // Disable floating virtual keyboard.
 KEYBOARD_EXPORT extern const char kFloatingVirtualKeyboardDisabled[];
 
@@ skipping 10 matching lines @@
 KEYBOARD_EXPORT extern const char kEnableVirtualKeyboardOverscroll[];
 
 // Disable automatic showing/hiding of the keyboard based on the devices plugged
 // in.
 KEYBOARD_EXPORT extern const char kDisableSmartVirtualKeyboard[];
 
 }  // namespace switches
 }  // namespace keyboard
 
 #endif  //  UI_KEYBOARD_KEYBOARD_SWITCHES_H_