Enabling new-style 'virtual viewport' pinch by default on ChromeOS

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 966 matching lines @@
     kOsAll,
     SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)
   },
   {
     "enable-pinch",
     IDS_FLAGS_ENABLE_PINCH_SCALE_NAME,
     IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION,
     kOsLinux | kOsWin | kOsCrOS,
     ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch),
   },
+#endif  // defined(USE_ASH)
   {
     "enable-pinch-virtual-viewport",
     IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_NAME,
     IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_DESCRIPTION,
-    kOsLinux | kOsWin | kOsCrOS,
+    kOsLinux | kOsWin | kOsAndroid,
     SINGLE_VALUE_TYPE(cc::switches::kEnablePinchVirtualViewport),
   },
-#endif  // defined(USE_ASH)
   {
     "enable-viewport-meta",
     IDS_FLAGS_ENABLE_VIEWPORT_META_NAME,
     IDS_FLAGS_ENABLE_VIEWPORT_META_DESCRIPTION,
     kOsLinux | kOsWin | kOsCrOS | kOsMac,
     SINGLE_VALUE_TYPE(switches::kEnableViewportMeta),
   },
 #if defined(OS_CHROMEOS)
   {
     "disable-boot-animation",
@@ skipping 1290 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags