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 15 matching lines...) Expand all Loading... | |
26 #include "build/build_config.h" | 26 #include "build/build_config.h" |
27 #include "cc/base/switches.h" | 27 #include "cc/base/switches.h" |
28 #include "chrome/common/channel_info.h" | 28 #include "chrome/common/channel_info.h" |
29 #include "chrome/common/chrome_content_client.h" | 29 #include "chrome/common/chrome_content_client.h" |
30 #include "chrome/common/chrome_features.h" | 30 #include "chrome/common/chrome_features.h" |
31 #include "chrome/common/chrome_switches.h" | 31 #include "chrome/common/chrome_switches.h" |
32 #include "chrome/common/features.h" | 32 #include "chrome/common/features.h" |
33 #include "chrome/grit/chromium_strings.h" | 33 #include "chrome/grit/chromium_strings.h" |
34 #include "chrome/grit/generated_resources.h" | 34 #include "chrome/grit/generated_resources.h" |
35 #include "chrome/grit/google_chrome_strings.h" | 35 #include "chrome/grit/google_chrome_strings.h" |
36 #include "components/autofill/core/browser/autofill_experiments.h" | |
36 #include "components/autofill/core/common/autofill_switches.h" | 37 #include "components/autofill/core/common/autofill_switches.h" |
37 #include "components/browser_sync/common/browser_sync_switches.h" | 38 #include "components/browser_sync/common/browser_sync_switches.h" |
38 #include "components/cloud_devices/common/cloud_devices_switches.h" | 39 #include "components/cloud_devices/common/cloud_devices_switches.h" |
39 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h" | 40 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h" |
40 #include "components/dom_distiller/core/dom_distiller_switches.h" | 41 #include "components/dom_distiller/core/dom_distiller_switches.h" |
41 #include "components/error_page/common/error_page_switches.h" | 42 #include "components/error_page/common/error_page_switches.h" |
42 #include "components/flags_ui/feature_entry_macros.h" | 43 #include "components/flags_ui/feature_entry_macros.h" |
43 #include "components/flags_ui/flags_storage.h" | 44 #include "components/flags_ui/flags_storage.h" |
44 #include "components/flags_ui/flags_ui_switches.h" | 45 #include "components/flags_ui/flags_ui_switches.h" |
45 #include "components/nacl/common/nacl_switches.h" | 46 #include "components/nacl/common/nacl_switches.h" |
(...skipping 1426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1472 FEATURE_VALUE_TYPE(features::kCredentialManagementAPI)}, | 1473 FEATURE_VALUE_TYPE(features::kCredentialManagementAPI)}, |
1473 {"reduced-referrer-granularity", | 1474 {"reduced-referrer-granularity", |
1474 IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_NAME, | 1475 IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_NAME, |
1475 IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_DESCRIPTION, kOsAll, | 1476 IDS_FLAGS_REDUCED_REFERRER_GRANULARITY_DESCRIPTION, kOsAll, |
1476 SINGLE_VALUE_TYPE(switches::kReducedReferrerGranularity)}, | 1477 SINGLE_VALUE_TYPE(switches::kReducedReferrerGranularity)}, |
1477 #if defined(OS_CHROMEOS) | 1478 #if defined(OS_CHROMEOS) |
1478 {"disable-new-zip-unpacker", IDS_FLAGS_NEW_ZIP_UNPACKER_NAME, | 1479 {"disable-new-zip-unpacker", IDS_FLAGS_NEW_ZIP_UNPACKER_NAME, |
1479 IDS_FLAGS_NEW_ZIP_UNPACKER_DESCRIPTION, kOsCrOS, | 1480 IDS_FLAGS_NEW_ZIP_UNPACKER_DESCRIPTION, kOsCrOS, |
1480 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker)}, | 1481 SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker)}, |
1481 #endif // defined(OS_CHROMEOS) | 1482 #endif // defined(OS_CHROMEOS) |
1483 {"enable-credit-card-assist", IDS_FLAGS_CREDIT_CARD_ASSIST_NAME, | |
1484 IDS_FLAGS_CREDIT_CARD_ASSIST_DESCRIPTION, kOsAndroid, | |
1485 FEATURE_VALUE_TYPE(autofill::kAutofillCreditCardAssist)}, | |
please use gerrit instead
2016/07/29 16:33:20
I think recently the common practise has been to p
Mathieu
2016/07/29 20:19:17
OK, also lumped Save Card in there.
| |
1482 {"enable-credit-card-scan", IDS_FLAGS_CREDIT_CARD_SCAN_NAME, | 1486 {"enable-credit-card-scan", IDS_FLAGS_CREDIT_CARD_SCAN_NAME, |
1483 IDS_FLAGS_CREDIT_CARD_SCAN_DESCRIPTION, kOsAndroid, | 1487 IDS_FLAGS_CREDIT_CARD_SCAN_DESCRIPTION, kOsAndroid, |
1484 ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan, | 1488 ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan, |
1485 autofill::switches::kDisableCreditCardScan)}, | 1489 autofill::switches::kDisableCreditCardScan)}, |
1486 #if defined(OS_CHROMEOS) | 1490 #if defined(OS_CHROMEOS) |
1487 {"disable-captive-portal-bypass-proxy", | 1491 {"disable-captive-portal-bypass-proxy", |
1488 IDS_FLAGS_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, | 1492 IDS_FLAGS_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, |
1489 IDS_FLAGS_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, kOsCrOS, | 1493 IDS_FLAGS_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, kOsCrOS, |
1490 SINGLE_DISABLE_VALUE_TYPE( | 1494 SINGLE_DISABLE_VALUE_TYPE( |
1491 chromeos::switches::kDisableCaptivePortalBypassProxy)}, | 1495 chromeos::switches::kDisableCaptivePortalBypassProxy)}, |
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2212 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2216 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2213 | 2217 |
2214 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2218 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2215 *count = arraysize(kFeatureEntries); | 2219 *count = arraysize(kFeatureEntries); |
2216 return kFeatureEntries; | 2220 return kFeatureEntries; |
2217 } | 2221 } |
2218 | 2222 |
2219 } // namespace testing | 2223 } // namespace testing |
2220 | 2224 |
2221 } // namespace about_flags | 2225 } // namespace about_flags |
OLD | NEW |