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 2084 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2095 {"arc-use-auth-endpoint", IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_NAME, | 2095 {"arc-use-auth-endpoint", IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_NAME, |
2096 IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_DESCRIPTION, kOsCrOS, | 2096 IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_DESCRIPTION, kOsCrOS, |
2097 SINGLE_VALUE_TYPE_AND_VALUE( | 2097 SINGLE_VALUE_TYPE_AND_VALUE( |
2098 chromeos::switches::kArcUseAuthEndpoint, | 2098 chromeos::switches::kArcUseAuthEndpoint, |
2099 "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" | 2099 "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" |
2100 "ExchangeToken")}, | 2100 "ExchangeToken")}, |
2101 #endif | 2101 #endif |
2102 {"material-security-verbose", IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_NAME, | 2102 {"material-security-verbose", IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_NAME, |
2103 IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_DESCRIPTION, kOsDesktop, | 2103 IDS_FLAGS_MATERIAL_SECURITY_VERBOSE_DESCRIPTION, kOsDesktop, |
2104 MULTI_VALUE_TYPE(kSecurityVerboseChoices)}, | 2104 MULTI_VALUE_TYPE(kSecurityVerboseChoices)}, |
| 2105 #if defined(OS_CHROMEOS) |
| 2106 {"disable-arc-boot-completed-broadcast", |
| 2107 IDS_FLAGS_ARC_ACTION_BOOT_COMPLETED, |
| 2108 IDS_FLAGS_ARC_ACTION_BOOT_COMPLETED_DESCRIPTION, kOsCrOS, |
| 2109 SINGLE_VALUE_TYPE(chromeos::switches::kDisableArcBootCompletedBroadcast) |
| 2110 }, |
| 2111 #endif |
2105 // NOTE: Adding new command-line switches requires adding corresponding | 2112 // NOTE: Adding new command-line switches requires adding corresponding |
2106 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2113 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2107 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2114 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2108 }; | 2115 }; |
2109 | 2116 |
2110 class FlagsStateSingleton { | 2117 class FlagsStateSingleton { |
2111 public: | 2118 public: |
2112 FlagsStateSingleton() | 2119 FlagsStateSingleton() |
2113 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2120 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2114 ~FlagsStateSingleton() {} | 2121 ~FlagsStateSingleton() {} |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2303 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2310 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2304 | 2311 |
2305 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2312 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2306 *count = arraysize(kFeatureEntries); | 2313 *count = arraysize(kFeatureEntries); |
2307 return kFeatureEntries; | 2314 return kFeatureEntries; |
2308 } | 2315 } |
2309 | 2316 |
2310 } // namespace testing | 2317 } // namespace testing |
2311 | 2318 |
2312 } // namespace about_flags | 2319 } // namespace about_flags |
OLD | NEW |