Merge gesture deletion and selection.

chrome/browser/about_flags.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 "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 469 matching lines @@
 const Experiment::Choice kGestureTypingChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
     keyboard::switches::kGestureTyping,
     keyboard::switches::kGestureTypingDisabled},
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
     keyboard::switches::kGestureTyping,
     keyboard::switches::kGestureTypingEnabled},
 };
 
-const Experiment::Choice kGestureSelectionChoices[] = {
+const Experiment::Choice kGestureEditingChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    keyboard::switches::kGestureSelection,
-    keyboard::switches::kGestureSelectionDisabled},
+    keyboard::switches::kGestureEditing,
+    keyboard::switches::kGestureEditingDisabled},
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    keyboard::switches::kGestureSelection,
-    keyboard::switches::kGestureSelectionEnabled},
-};
-
-const Experiment::Choice kGestureDeletionChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    keyboard::switches::kGestureDeletion,
-    keyboard::switches::kGestureDeletionDisabled},
-  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    keyboard::switches::kGestureDeletion,
-    keyboard::switches::kGestureDeletionEnabled},
+    keyboard::switches::kGestureEditing,
+    keyboard::switches::kGestureEditingEnabled},
 };
 #endif
 
 const Experiment::Choice kSupervisedUserSafeSitesChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
     switches::kSupervisedUserSafeSites,
     "enabled" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
     switches::kSupervisedUserSafeSites,
@@ skipping 963 matching lines @@
     MULTI_VALUE_TYPE(kFloatingVirtualKeyboardChoices)
   },
   {
     "gesture-typing",
     IDS_FLAGS_GESTURE_TYPING_NAME,
     IDS_FLAGS_GESTURE_TYPING_DESCRIPTION,
     kOsCrOS,
     MULTI_VALUE_TYPE(kGestureTypingChoices)
   },
   {
-    "gesture-selection",
-    IDS_FLAGS_GESTURE_SELECTION_NAME,
-    IDS_FLAGS_GESTURE_SELECTION_DESCRIPTION,
+    "gesture-editing",
+    IDS_FLAGS_GESTURE_EDITING_NAME,
+    IDS_FLAGS_GESTURE_EDITING_DESCRIPTION,
     kOsCrOS,
-    MULTI_VALUE_TYPE(kGestureSelectionChoices)
-  },
-  {
-    "gesture-deletion",
-    IDS_FLAGS_GESTURE_DELETION_NAME,
-    IDS_FLAGS_GESTURE_DELETION_DESCRIPTION,
-    kOsCrOS,
-    MULTI_VALUE_TYPE(kGestureDeletionChoices)
+    MULTI_VALUE_TYPE(kGestureEditingChoices)
   },
   {
     "disable-smart-virtual-keyboard",
     IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_NAME,
     IDS_FLAGS_DISABLE_SMART_VIRTUAL_KEYBOARD_DESCRIPTION,
     kOsCrOS,
     SINGLE_VALUE_TYPE(keyboard::switches::kDisableSmartVirtualKeyboard)
   },
 #endif
   {
@@ skipping 1544 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags