| OLD | NEW | 
|     1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |     1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|     2 // Use of this source code is governed by a BSD-style license that can be |     2 // Use of this source code is governed by a BSD-style license that can be | 
|     3 // found in the LICENSE file. |     3 // found in the LICENSE file. | 
|     4  |     4  | 
|     5 #include "chrome/browser/about_flags.h" |     5 #include "chrome/browser/about_flags.h" | 
|     6  |     6  | 
|     7 #include <iterator> |     7 #include <iterator> | 
|     8 #include <map> |     8 #include <map> | 
|     9 #include <set> |     9 #include <set> | 
|    10 #include <utility> |    10 #include <utility> | 
| (...skipping 2286 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2297      flag_descriptions::kPassiveEventListenersDueToFlingName, |  2297      flag_descriptions::kPassiveEventListenersDueToFlingName, | 
|  2298      flag_descriptions::kPassiveEventListenersDueToFlingDescription, kOsAll, |  2298      flag_descriptions::kPassiveEventListenersDueToFlingDescription, kOsAll, | 
|  2299      FEATURE_VALUE_TYPE(features::kPassiveEventListenersDueToFling)}, |  2299      FEATURE_VALUE_TYPE(features::kPassiveEventListenersDueToFling)}, | 
|  2300     {"enable-font-cache-scaling", flag_descriptions::kFontCacheScalingName, |  2300     {"enable-font-cache-scaling", flag_descriptions::kFontCacheScalingName, | 
|  2301      flag_descriptions::kFontCacheScalingDescription, kOsAll, |  2301      flag_descriptions::kFontCacheScalingDescription, kOsAll, | 
|  2302      FEATURE_VALUE_TYPE(features::kFontCacheScaling)}, |  2302      FEATURE_VALUE_TYPE(features::kFontCacheScaling)}, | 
|  2303     {"enable-framebusting-needs-sameorigin-or-usergesture", |  2303     {"enable-framebusting-needs-sameorigin-or-usergesture", | 
|  2304      flag_descriptions::kFramebustingName, |  2304      flag_descriptions::kFramebustingName, | 
|  2305      flag_descriptions::kFramebustingDescription, kOsAll, |  2305      flag_descriptions::kFramebustingDescription, kOsAll, | 
|  2306      FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, |  2306      FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, | 
 |  2307     {"vibrate-requires-user-gesture", | 
 |  2308      flag_descriptions::kVibrateRequiresUserGestureName, | 
 |  2309      flag_descriptions::kVibrateRequiresUserGestureDescription, kOsAll, | 
 |  2310      FEATURE_VALUE_TYPE(features::kVibrateRequiresUserGesture)}, | 
|  2307     {"web-payments", flag_descriptions::kWebPaymentsName, |  2311     {"web-payments", flag_descriptions::kWebPaymentsName, | 
|  2308      flag_descriptions::kWebPaymentsDescription, kOsDesktop, |  2312      flag_descriptions::kWebPaymentsDescription, kOsDesktop, | 
|  2309      FEATURE_VALUE_TYPE(features::kWebPayments)}, |  2313      FEATURE_VALUE_TYPE(features::kWebPayments)}, | 
|  2310 #if defined(OS_ANDROID) |  2314 #if defined(OS_ANDROID) | 
|  2311     {"enable-android-pay-integration-v1", |  2315     {"enable-android-pay-integration-v1", | 
|  2312      flag_descriptions::kEnableAndroidPayIntegrationV1Name, |  2316      flag_descriptions::kEnableAndroidPayIntegrationV1Name, | 
|  2313      flag_descriptions::kEnableAndroidPayIntegrationV1Description, kOsAndroid, |  2317      flag_descriptions::kEnableAndroidPayIntegrationV1Description, kOsAndroid, | 
|  2314      FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, |  2318      FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, | 
|  2315     {"enable-android-pay-integration-v2", |  2319     {"enable-android-pay-integration-v2", | 
|  2316      flag_descriptions::kEnableAndroidPayIntegrationV2Name, |  2320      flag_descriptions::kEnableAndroidPayIntegrationV2Name, | 
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2897 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |  2901 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 
|  2898  |  2902  | 
|  2899 const FeatureEntry* GetFeatureEntries(size_t* count) { |  2903 const FeatureEntry* GetFeatureEntries(size_t* count) { | 
|  2900   *count = arraysize(kFeatureEntries); |  2904   *count = arraysize(kFeatureEntries); | 
|  2901   return kFeatureEntries; |  2905   return kFeatureEntries; | 
|  2902 } |  2906 } | 
|  2903  |  2907  | 
|  2904 }  // namespace testing |  2908 }  // namespace testing | 
|  2905  |  2909  | 
|  2906 }  // namespace about_flags |  2910 }  // namespace about_flags | 
| OLD | NEW |