| 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 1954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1965 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, | 1965 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, |
| 1966 #if defined(OS_ANDROID) | 1966 #if defined(OS_ANDROID) |
| 1967 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, | 1967 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, |
| 1968 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, | 1968 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, |
| 1969 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, | 1969 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, |
| 1970 switches::kDisableVrShell)}, | 1970 switches::kDisableVrShell)}, |
| 1971 {"enable-android-pay-integration-v1", | 1971 {"enable-android-pay-integration-v1", |
| 1972 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, | 1972 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, |
| 1973 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, | 1973 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, |
| 1974 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, | 1974 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, |
| 1975 {"scan-cards-in-web-payments", IDS_FLAGS_SCAN_CARDS_IN_WEB_PAYMENTS_NAME, | |
| 1976 IDS_FLAGS_SCAN_CARDS_IN_WEB_PAYMENTS_DESCRIPTION, kOsAndroid, | |
| 1977 FEATURE_VALUE_TYPE(chrome::android::kScanCardsInWebPayments)}, | |
| 1978 #endif // OS_ANDROID | 1975 #endif // OS_ANDROID |
| 1979 #if defined(OS_CHROMEOS) | 1976 #if defined(OS_CHROMEOS) |
| 1980 {"disable-eol-notification", IDS_FLAGS_EOL_NOTIFICATION_NAME, | 1977 {"disable-eol-notification", IDS_FLAGS_EOL_NOTIFICATION_NAME, |
| 1981 IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS, | 1978 IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS, |
| 1982 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)}, | 1979 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)}, |
| 1983 #endif // OS_CHROMEOS | 1980 #endif // OS_CHROMEOS |
| 1984 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, | 1981 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, |
| 1985 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, | 1982 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, |
| 1986 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, | 1983 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, |
| 1987 {"new-audio-rendering-mixing-strategy", | 1984 {"new-audio-rendering-mixing-strategy", |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2274 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2271 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2275 | 2272 |
| 2276 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2273 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2277 *count = arraysize(kFeatureEntries); | 2274 *count = arraysize(kFeatureEntries); |
| 2278 return kFeatureEntries; | 2275 return kFeatureEntries; |
| 2279 } | 2276 } |
| 2280 | 2277 |
| 2281 } // namespace testing | 2278 } // namespace testing |
| 2282 | 2279 |
| 2283 } // namespace about_flags | 2280 } // namespace about_flags |
| OLD | NEW |