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 "base/values.h" | 26 #include "base/values.h" |
27 #include "build/build_config.h" | 27 #include "build/build_config.h" |
28 #include "cc/base/switches.h" | 28 #include "cc/base/switches.h" |
29 #include "chrome/common/channel_info.h" | 29 #include "chrome/common/channel_info.h" |
30 #include "chrome/common/chrome_content_client.h" | 30 #include "chrome/common/chrome_content_client.h" |
31 #include "chrome/common/chrome_features.h" | 31 #include "chrome/common/chrome_features.h" |
32 #include "chrome/common/chrome_switches.h" | 32 #include "chrome/common/chrome_switches.h" |
33 #include "chrome/common/features.h" | 33 #include "chrome/common/features.h" |
34 #include "chrome/grit/chromium_strings.h" | 34 #include "chrome/grit/chromium_strings.h" |
35 #include "chrome/grit/generated_resources.h" | 35 #include "chrome/grit/generated_resources.h" |
36 #include "components/arc/arc_features.h" | |
36 #include "components/autofill/core/browser/autofill_experiments.h" | 37 #include "components/autofill/core/browser/autofill_experiments.h" |
37 #include "components/autofill/core/common/autofill_switches.h" | 38 #include "components/autofill/core/common/autofill_switches.h" |
38 #include "components/browser_sync/browser_sync_switches.h" | 39 #include "components/browser_sync/browser_sync_switches.h" |
39 #include "components/cloud_devices/common/cloud_devices_switches.h" | 40 #include "components/cloud_devices/common/cloud_devices_switches.h" |
40 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h" | 41 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h" |
41 #include "components/dom_distiller/core/dom_distiller_switches.h" | 42 #include "components/dom_distiller/core/dom_distiller_switches.h" |
42 #include "components/error_page/common/error_page_switches.h" | 43 #include "components/error_page/common/error_page_switches.h" |
43 #include "components/flags_ui/feature_entry_macros.h" | 44 #include "components/flags_ui/feature_entry_macros.h" |
44 #include "components/flags_ui/flags_storage.h" | 45 #include "components/flags_ui/flags_storage.h" |
45 #include "components/flags_ui/flags_ui_switches.h" | 46 #include "components/flags_ui/flags_ui_switches.h" |
(...skipping 2049 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2095 {"arc-use-auth-endpoint", IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_NAME, | 2096 {"arc-use-auth-endpoint", IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_NAME, |
2096 IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_DESCRIPTION, kOsCrOS, | 2097 IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_DESCRIPTION, kOsCrOS, |
2097 SINGLE_VALUE_TYPE_AND_VALUE( | 2098 SINGLE_VALUE_TYPE_AND_VALUE( |
2098 chromeos::switches::kArcUseAuthEndpoint, | 2099 chromeos::switches::kArcUseAuthEndpoint, |
2099 "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" | 2100 "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" |
2100 "ExchangeToken")}, | 2101 "ExchangeToken")}, |
2101 #endif | 2102 #endif |
2102 {"material-security-verbose", IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_NAME, | 2103 {"material-security-verbose", IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_NAME, |
2103 IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_DESCRIPTION, kOsDesktop, | 2104 IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_DESCRIPTION, kOsDesktop, |
2104 MULTI_VALUE_TYPE(kSecurityVerboseChoices)}, | 2105 MULTI_VALUE_TYPE(kSecurityVerboseChoices)}, |
2106 #if defined(OS_CHROMEOS) | |
2107 {"disable-arc-boot-completed-broadcast", | |
2108 IDS_FLAGS_ARC_ACTION_BOOT_COMPLETED, | |
2109 IDS_FLAGS_ARC_ACTION_BOOT_COMPLETED_DESCRIPTION, kOsCrOS, | |
2110 FEATURE_VALUE_TYPE(features::kDisableArcBootCompletedBroadcast) | |
2111 }, | |
Alexei Svitkine (slow)
2016/09/30 21:34:04
Nit: This should go on the previous line - as it d
xzhou
2016/10/01 00:37:42
Done.
| |
2112 #endif | |
2105 // NOTE: Adding new command-line switches requires adding corresponding | 2113 // NOTE: Adding new command-line switches requires adding corresponding |
2106 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2114 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2107 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2115 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2108 }; | 2116 }; |
2109 | 2117 |
2110 class FlagsStateSingleton { | 2118 class FlagsStateSingleton { |
2111 public: | 2119 public: |
2112 FlagsStateSingleton() | 2120 FlagsStateSingleton() |
2113 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2121 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2114 ~FlagsStateSingleton() {} | 2122 ~FlagsStateSingleton() {} |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2303 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2311 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2304 | 2312 |
2305 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2313 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2306 *count = arraysize(kFeatureEntries); | 2314 *count = arraysize(kFeatureEntries); |
2307 return kFeatureEntries; | 2315 return kFeatureEntries; |
2308 } | 2316 } |
2309 | 2317 |
2310 } // namespace testing | 2318 } // namespace testing |
2311 | 2319 |
2312 } // namespace about_flags | 2320 } // namespace about_flags |
OLD | NEW |