Enable pinch & scrollbars by default for CrOS.

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 <string.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 948 matching lines @@
     IDS_FLAGS_SHOW_TOUCH_HUD_NAME,
     IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)
   },
   {
     "enable-pinch",
     IDS_FLAGS_ENABLE_PINCH_SCALE_NAME,
     IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION,
     kOsLinux | kOsWin | kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kEnablePinch),
+    ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch),
+  },
+  {
+    "pinch-zoom-scrollbars",
+    IDS_FLAGS_PINCH_ZOOM_SCROLLBARS_NAME,
+    IDS_FLAGS_PINCH_ZOOM_SCROLLBARS_DESCRIPTION,
+    kOsCrOS,
+    ENABLE_DISABLE_VALUE_TYPE(cc::switches::kEnablePinchZoomScrollbars,
+                              cc::switches::kDisablePinchZoomScrollbars)
   },
   {
     "app-list-show-apps-only",
     IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_NAME,
     IDS_FLAGS_ENABLE_APP_LIST_SHOW_APPS_ONLY_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(app_list::switches::kAppListShowAppsOnly),
   },
 #endif  // defined(USE_ASH)
 #if defined(OS_CHROMEOS)
@@ skipping 821 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags