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 1942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1953 IDS_FLAGS_FONT_CACHE_SCALING_DESCRIPTION, kOsAll, | 1953 IDS_FLAGS_FONT_CACHE_SCALING_DESCRIPTION, kOsAll, |
1954 FEATURE_VALUE_TYPE(features::kFontCacheScaling)}, | 1954 FEATURE_VALUE_TYPE(features::kFontCacheScaling)}, |
1955 {"enable-framebusting-needs-sameorigin-or-usergesture", | 1955 {"enable-framebusting-needs-sameorigin-or-usergesture", |
1956 IDS_FLAGS_FRAMEBUSTING_NAME, IDS_FLAGS_FRAMEBUSTING_DESCRIPTION, kOsAll, | 1956 IDS_FLAGS_FRAMEBUSTING_NAME, IDS_FLAGS_FRAMEBUSTING_DESCRIPTION, kOsAll, |
1957 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, | 1957 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, |
1958 #if defined(OS_ANDROID) | 1958 #if defined(OS_ANDROID) |
1959 {"enable-android-pay-integration-v1", | 1959 {"enable-android-pay-integration-v1", |
1960 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, | 1960 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, |
1961 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, | 1961 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, |
1962 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, | 1962 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, |
| 1963 {"enable-android-pay-integration-v2", |
| 1964 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_NAME, |
| 1965 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_DESCRIPTION, kOsAndroid, |
| 1966 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV2)}, |
1963 #endif // OS_ANDROID | 1967 #endif // OS_ANDROID |
1964 #if defined(OS_CHROMEOS) | 1968 #if defined(OS_CHROMEOS) |
1965 {"disable-eol-notification", IDS_FLAGS_EOL_NOTIFICATION_NAME, | 1969 {"disable-eol-notification", IDS_FLAGS_EOL_NOTIFICATION_NAME, |
1966 IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS, | 1970 IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS, |
1967 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)}, | 1971 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)}, |
1968 #endif // OS_CHROMEOS | 1972 #endif // OS_CHROMEOS |
1969 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, | 1973 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, |
1970 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, | 1974 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, |
1971 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, | 1975 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, |
1972 {"new-audio-rendering-mixing-strategy", | 1976 {"new-audio-rendering-mixing-strategy", |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2300 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2304 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2301 | 2305 |
2302 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2306 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2303 *count = arraysize(kFeatureEntries); | 2307 *count = arraysize(kFeatureEntries); |
2304 return kFeatureEntries; | 2308 return kFeatureEntries; |
2305 } | 2309 } |
2306 | 2310 |
2307 } // namespace testing | 2311 } // namespace testing |
2308 | 2312 |
2309 } // namespace about_flags | 2313 } // namespace about_flags |
OLD | NEW |