| 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 1967 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1978 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, | 1978 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, |
| 1979 #if defined(OS_ANDROID) | 1979 #if defined(OS_ANDROID) |
| 1980 {"enable-android-pay-integration-v1", | 1980 {"enable-android-pay-integration-v1", |
| 1981 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, | 1981 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, |
| 1982 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, | 1982 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, |
| 1983 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, | 1983 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, |
| 1984 {"enable-android-pay-integration-v2", | 1984 {"enable-android-pay-integration-v2", |
| 1985 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_NAME, | 1985 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_NAME, |
| 1986 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_DESCRIPTION, kOsAndroid, | 1986 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V2_DESCRIPTION, kOsAndroid, |
| 1987 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV2)}, | 1987 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV2)}, |
| 1988 {"android-payment-apps", |
| 1989 IDS_FLAGS_ANDROID_PAYMENT_APPS_NAME, |
| 1990 IDS_FLAGS_ANDROID_PAYMENT_APPS_DESCRIPTION, kOsAndroid, |
| 1991 FEATURE_VALUE_TYPE(chrome::android::kAndroidPaymentApps)}, |
| 1988 #endif // OS_ANDROID | 1992 #endif // OS_ANDROID |
| 1989 #if defined(OS_CHROMEOS) | 1993 #if defined(OS_CHROMEOS) |
| 1990 {"disable-eol-notification", IDS_FLAGS_EOL_NOTIFICATION_NAME, | 1994 {"disable-eol-notification", IDS_FLAGS_EOL_NOTIFICATION_NAME, |
| 1991 IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS, | 1995 IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS, |
| 1992 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)}, | 1996 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)}, |
| 1993 #endif // OS_CHROMEOS | 1997 #endif // OS_CHROMEOS |
| 1994 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, | 1998 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, |
| 1995 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, | 1999 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, |
| 1996 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, | 2000 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, |
| 1997 {"new-audio-rendering-mixing-strategy", | 2001 {"new-audio-rendering-mixing-strategy", |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2344 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2348 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2345 | 2349 |
| 2346 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2350 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2347 *count = arraysize(kFeatureEntries); | 2351 *count = arraysize(kFeatureEntries); |
| 2348 return kFeatureEntries; | 2352 return kFeatureEntries; |
| 2349 } | 2353 } |
| 2350 | 2354 |
| 2351 } // namespace testing | 2355 } // namespace testing |
| 2352 | 2356 |
| 2353 } // namespace about_flags | 2357 } // namespace about_flags |
| OLD | NEW |