Replace multi-value keyboard flags with single value flag types.

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 378 matching lines @@
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
     chromeos::switches::kEnableDataSaverPrompt, "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
     chromeos::switches::kDisableDataSaverPrompt, "" },
   { IDS_FLAGS_DATASAVER_PROMPT_DEMO_MODE,
     chromeos::switches::kEnableDataSaverPrompt,
     chromeos::switches::kDataSaverPromptDemoMode },
 };
 
-const FeatureEntry::Choice kFloatingVirtualKeyboardChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    keyboard::switches::kFloatingVirtualKeyboard,
-    keyboard::switches::kFloatingVirtualKeyboardDisabled},
-  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    keyboard::switches::kFloatingVirtualKeyboard,
-    keyboard::switches::kFloatingVirtualKeyboardEnabled},
-};
-
-const FeatureEntry::Choice kSmartVirtualKeyboardChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    keyboard::switches::kSmartVirtualKeyboard,
-    keyboard::switches::kSmartVirtualKeyboardDisabled},
-  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    keyboard::switches::kSmartVirtualKeyboard,
-    keyboard::switches::kSmartVirtualKeyboardEnabled},
-};
-
-const FeatureEntry::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 FeatureEntry::Choice kGestureEditingChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    keyboard::switches::kGestureEditing,
-    keyboard::switches::kGestureEditingDisabled},
-  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
-    keyboard::switches::kGestureEditing,
-    keyboard::switches::kGestureEditingEnabled},
-};
-
 const FeatureEntry::Choice kDownloadNotificationChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
     switches::kEnableDownloadNotification,
     "enabled" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
     switches::kEnableDownloadNotification,
     "disabled" }
 };
 #endif
@@ skipping 730 matching lines @@
      IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION,
      kOsAll,
      SINGLE_DISABLE_VALUE_TYPE(
          switches::kDisableGestureRequirementForMediaPlayback)},
 #if defined(OS_CHROMEOS)
     {"enable-virtual-keyboard",
      IDS_FLAGS_VIRTUAL_KEYBOARD_NAME,
      IDS_FLAGS_VIRTUAL_KEYBOARD_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)},
-    {"enable-virtual-keyboard-overscroll",
+    {"virtual-keyboard-overscroll",
      IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_NAME,
      IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION,
      kOsCrOS,
-     ENABLE_DISABLE_VALUE_TYPE(
-         keyboard::switches::kEnableVirtualKeyboardOverscroll,
+     SINGLE_DISABLE_VALUE_TYPE(
          keyboard::switches::kDisableVirtualKeyboardOverscroll)},
-    {"enable-input-view",
+    {"input-view",
      IDS_FLAGS_INPUT_VIEW_NAME,
      IDS_FLAGS_INPUT_VIEW_DESCRIPTION,
      kOsCrOS,
-     ENABLE_DISABLE_VALUE_TYPE(keyboard::switches::kEnableInputView,
-                               keyboard::switches::kDisableInputView)},
+     SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableInputView)},
     {"disable-new-korean-ime",
      IDS_FLAGS_NEW_KOREAN_IME_NAME,
      IDS_FLAGS_NEW_KOREAN_IME_DESCRIPTION,
      kOsCrOS,
      SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableNewKoreanIme)},
     {"enable-physical-keyboard-autocorrect",
      IDS_FLAGS_PHYSICAL_KEYBOARD_AUTOCORRECT_NAME,
      IDS_FLAGS_PHYSICAL_KEYBOARD_AUTOCORRECT_DESCRIPTION,
      kOsCrOS,
      ENABLE_DISABLE_VALUE_TYPE(
          chromeos::switches::kEnablePhysicalKeyboardAutocorrect,
          chromeos::switches::kDisablePhysicalKeyboardAutocorrect)},
     {"disable-voice-input",
      IDS_FLAGS_VOICE_INPUT_NAME,
      IDS_FLAGS_VOICE_INPUT_DESCRIPTION,
      kOsCrOS,
      SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableVoiceInput)},
-    {"enable-experimental-input-view-features",
+    {"experimental-input-view-features",
      IDS_FLAGS_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME,
      IDS_FLAGS_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(
          keyboard::switches::kEnableExperimentalInputViewFeatures)},
     {"floating-virtual-keyboard",
      IDS_FLAGS_FLOATING_VIRTUAL_KEYBOARD_NAME,
      IDS_FLAGS_FLOATING_VIRTUAL_KEYBOARD_DESCRIPTION,
      kOsCrOS,
-     MULTI_VALUE_TYPE(kFloatingVirtualKeyboardChoices)},
+     SINGLE_VALUE_TYPE(keyboard::switches::kEnableFloatingVirtualKeyboard)},
     {"smart-virtual-keyboard",
      IDS_FLAGS_SMART_VIRTUAL_KEYBOARD_NAME,
      IDS_FLAGS_SMART_VIRTUAL_KEYBOARD_DESCRIPTION,
      kOsCrOS,
-     MULTI_VALUE_TYPE(kSmartVirtualKeyboardChoices)},
+     SINGLE_DISABLE_VALUE_TYPE(
+         keyboard::switches::kDisableSmartVirtualKeyboard)},
     {"gesture-typing",
      IDS_FLAGS_GESTURE_TYPING_NAME,
      IDS_FLAGS_GESTURE_TYPING_DESCRIPTION,
      kOsCrOS,
-     MULTI_VALUE_TYPE(kGestureTypingChoices)},
+     SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableGestureTyping)},
     {"gesture-editing",
      IDS_FLAGS_GESTURE_EDITING_NAME,
      IDS_FLAGS_GESTURE_EDITING_DESCRIPTION,
      kOsCrOS,
-     MULTI_VALUE_TYPE(kGestureEditingChoices)},
+     SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableGestureEditing)},
     {"enable-fullscreen-app-list",
      IDS_FLAGS_FULLSCREEN_APP_LIST_NAME,
      IDS_FLAGS_FULLSCREEN_APP_LIST_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(ash::switches::kAshEnableFullscreenAppList)},
 #endif
     {"enable-simple-cache-backend",
      IDS_FLAGS_SIMPLE_CACHE_BACKEND_NAME,
      IDS_FLAGS_SIMPLE_CACHE_BACKEND_DESCRIPTION,
      kOsWin | kOsMac | kOsLinux | kOsCrOS,
@@ skipping 1054 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags