| 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 1974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1985 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, | 1985 FEATURE_VALUE_TYPE(features::kFramebustingNeedsSameOriginOrUserGesture)}, |
| 1986 #if defined(OS_ANDROID) | 1986 #if defined(OS_ANDROID) |
| 1987 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, | 1987 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, |
| 1988 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, | 1988 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, |
| 1989 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, | 1989 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableVrShell, |
| 1990 switches::kDisableVrShell)}, | 1990 switches::kDisableVrShell)}, |
| 1991 {"enable-android-pay-integration-v1", | 1991 {"enable-android-pay-integration-v1", |
| 1992 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, | 1992 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_NAME, |
| 1993 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, | 1993 IDS_FLAGS_ENABLE_ANDROID_PAY_INTEGRATION_V1_DESCRIPTION, kOsAndroid, |
| 1994 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, | 1994 FEATURE_VALUE_TYPE(chrome::android::kAndroidPayIntegrationV1)}, |
| 1995 {"scan-cards-in-web-payments", IDS_FLAGS_SCAN_CARDS_IN_WEB_PAYMENTS_NAME, | |
| 1996 IDS_FLAGS_SCAN_CARDS_IN_WEB_PAYMENTS_DESCRIPTION, kOsAndroid, | |
| 1997 FEATURE_VALUE_TYPE(chrome::android::kScanCardsInWebPayments)}, | |
| 1998 #endif // OS_ANDROID | 1995 #endif // OS_ANDROID |
| 1999 #if defined(OS_CHROMEOS) | 1996 #if defined(OS_CHROMEOS) |
| 2000 {"disable-eol-notification", IDS_FLAGS_EOL_NOTIFICATION_NAME, | 1997 {"disable-eol-notification", IDS_FLAGS_EOL_NOTIFICATION_NAME, |
| 2001 IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS, | 1998 IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS, |
| 2002 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)}, | 1999 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)}, |
| 2003 #endif // OS_CHROMEOS | 2000 #endif // OS_CHROMEOS |
| 2004 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, | 2001 {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME, |
| 2005 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, | 2002 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll, |
| 2006 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, | 2003 FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)}, |
| 2007 {"new-audio-rendering-mixing-strategy", | 2004 {"new-audio-rendering-mixing-strategy", |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2265 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2262 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2266 | 2263 |
| 2267 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2264 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2268 *count = arraysize(kFeatureEntries); | 2265 *count = arraysize(kFeatureEntries); |
| 2269 return kFeatureEntries; | 2266 return kFeatureEntries; |
| 2270 } | 2267 } |
| 2271 | 2268 |
| 2272 } // namespace testing | 2269 } // namespace testing |
| 2273 | 2270 |
| 2274 } // namespace about_flags | 2271 } // namespace about_flags |
| OLD | NEW |