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 2182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2193 IDS_FLAGS_SHOW_ARC_FILES_APP_DESCRIPTION, kOsCrOS, | 2193 IDS_FLAGS_SHOW_ARC_FILES_APP_DESCRIPTION, kOsCrOS, |
2194 FEATURE_VALUE_TYPE(arc::kShowArcFilesAppFeature)}, | 2194 FEATURE_VALUE_TYPE(arc::kShowArcFilesAppFeature)}, |
2195 #endif // defined(OS_CHROMEOS) | 2195 #endif // defined(OS_CHROMEOS) |
2196 | 2196 |
2197 #if defined(OS_ANDROID) | 2197 #if defined(OS_ANDROID) |
2198 {"aia-fetching", IDS_FLAGS_AIA_FETCHING_NAME, | 2198 {"aia-fetching", IDS_FLAGS_AIA_FETCHING_NAME, |
2199 IDS_FLAGS_AIA_FETCHING_DESCRIPTION, kOsAndroid, | 2199 IDS_FLAGS_AIA_FETCHING_DESCRIPTION, kOsAndroid, |
2200 FEATURE_VALUE_TYPE(net::CertVerifyProcAndroid::kAIAFetchingFeature)}, | 2200 FEATURE_VALUE_TYPE(net::CertVerifyProcAndroid::kAIAFetchingFeature)}, |
2201 #endif | 2201 #endif |
2202 | 2202 |
| 2203 #if defined(OS_CHROMEOS) |
| 2204 {"force-enable-stylus-tools", IDS_FLAGS_FORCE_ENABLE_STYLUS_TOOLS_NAME, |
| 2205 IDS_FLAGS_FORCE_ENABLE_STYLUS_TOOLS_DESCRIPTION, kOsCrOS, |
| 2206 SINGLE_VALUE_TYPE(ash::switches::kAshForceEnablePalette)}, |
| 2207 #endif // defined(OS_CHROMEOS) |
| 2208 |
2203 // NOTE: Adding new command-line switches requires adding corresponding | 2209 // NOTE: Adding new command-line switches requires adding corresponding |
2204 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2210 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2205 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2211 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2206 }; | 2212 }; |
2207 | 2213 |
2208 class FlagsStateSingleton { | 2214 class FlagsStateSingleton { |
2209 public: | 2215 public: |
2210 FlagsStateSingleton() | 2216 FlagsStateSingleton() |
2211 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2217 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2212 ~FlagsStateSingleton() {} | 2218 ~FlagsStateSingleton() {} |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2401 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2407 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2402 | 2408 |
2403 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2409 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2404 *count = arraysize(kFeatureEntries); | 2410 *count = arraysize(kFeatureEntries); |
2405 return kFeatureEntries; | 2411 return kFeatureEntries; |
2406 } | 2412 } |
2407 | 2413 |
2408 } // namespace testing | 2414 } // namespace testing |
2409 | 2415 |
2410 } // namespace about_flags | 2416 } // namespace about_flags |
OLD | NEW |