gesture-nav: Introduce a 'simple' option for the gesture-nav UI.

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 <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 156 matching lines @@
 const Experiment::Choice kTouchOptimizedUIChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
     switches::kTouchOptimizedUI,
     switches::kTouchOptimizedUIEnabled },
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
     switches::kTouchOptimizedUI,
     switches::kTouchOptimizedUIDisabled }
 };
 
+#if defined(USE_AURA)
+const Experiment::Choice kOverscrollHistoryNavigationChoices[] = {
+  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" },
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+    switches::kOverscrollHistoryNavigation,
+    "0" },
+  { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
+    switches::kOverscrollHistoryNavigation,
+    "2" }
+};
+#endif
+
 const Experiment::Choice kNaClDebugMaskChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   // Secure shell can be used on ChromeOS for forwarding the TCP port opened by
   // debug stub to a remote machine. Since secure shell uses NaCl, we provide
   // an option to switch off its debugging.
   { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS,
       switches::kNaClDebugMask, "!*://*/*ssh_client.nmf" },
   { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG,
       switches::kNaClDebugMask, "*://*/*debug.nmf" }
 };
@@ skipping 1146 matching lines @@
     ENABLE_DISABLE_VALUE_TYPE(
         autofill::switches::kEnableInteractiveAutocomplete,
         autofill::switches::kDisableInteractiveAutocomplete)
   },
 #if defined(USE_AURA)
   {
     "overscroll-history-navigation",
     IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME,
     IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION,
     kOsAll,
-    ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
-        switches::kOverscrollHistoryNavigation, "1",
-        switches::kOverscrollHistoryNavigation, "0")
+    MULTI_VALUE_TYPE(kOverscrollHistoryNavigationChoices)
   },
 #endif
   {
     "scroll-end-effect",
     IDS_FLAGS_SCROLL_END_EFFECT_NAME,
     IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION,
     kOsCrOS,
     ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
         switches::kScrollEndEffect, "1",
         switches::kScrollEndEffect, "0")
@@ skipping 1154 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags