| 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 2002 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2013 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, | 2013 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, |
| 2014 #if defined(OS_ANDROID) | 2014 #if defined(OS_ANDROID) |
| 2015 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, | 2015 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, |
| 2016 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, | 2016 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, |
| 2017 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, | 2017 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, |
| 2018 switches::kDisableVrShell)}, | 2018 switches::kDisableVrShell)}, |
| 2019 {"enable-android-pay-integration-v1", | 2019 {"enable-android-pay-integration-v1", |
| 2020 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, | 2020 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, |
| 2021 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, | 2021 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, |
| 2022 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, | 2022 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, |
| 2023 {"scan-cards-in-web-payments", |
| 2024 IDS_FLAGS_SCAN_CARDS_IN_WEB_PAYMENTS_NAME, |
| 2025 IDS_FLAGS_SCAN_CARDS_IN_WEB_PAYMENTS_DESCRIPTION, kOsAndroid, |
| 2026 FEATURE_VALUE_TYPE(chrome::android::kScanCardsInWebPayments)}, |
| 2023 #endif | 2027 #endif |
| 2024 #if defined(OS_CHROMEOS) | 2028 #if defined(OS_CHROMEOS) |
| 2025 {"disable-eol-notification", IDS_FLAGS_EOL_NOTIFICATION_NAME, | 2029 {"disable-eol-notification", IDS_FLAGS_EOL_NOTIFICATION_NAME, |
| 2026 IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS, | 2030 IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS, |
| 2027 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)}, | 2031 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)}, |
| 2028 #endif // defined(OS_CHROMEOS) | 2032 #endif // defined(OS_CHROMEOS) |
| 2029 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, | 2033 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, |
| 2030 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, | 2034 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, |
| 2031 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, | 2035 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, |
| 2032 {"new-audio-rendering-mixing-strategy", | 2036 {"new-audio-rendering-mixing-strategy", |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2250 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2254 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2251 | 2255 |
| 2252 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2256 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2253 *count = arraysize(kFeatureEntries); | 2257 *count = arraysize(kFeatureEntries); |
| 2254 return kFeatureEntries; | 2258 return kFeatureEntries; |
| 2255 } | 2259 } |
| 2256 | 2260 |
| 2257 } // namespace testing | 2261 } // namespace testing |
| 2258 | 2262 |
| 2259 } // namespace about_flags | 2263 } // namespace about_flags |
| OLD | NEW |