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 3105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3116 flag_descriptions::kExperimentalFullscreenExitUIName, | 3116 flag_descriptions::kExperimentalFullscreenExitUIName, |
3117 flag_descriptions::kExperimentalFullscreenExitUIDescription, | 3117 flag_descriptions::kExperimentalFullscreenExitUIDescription, |
3118 kOsWin | kOsLinux | kOsCrOS, | 3118 kOsWin | kOsLinux | kOsCrOS, |
3119 SINGLE_VALUE_TYPE(switches::kEnableExperimentalFullscreenExitUI)}, | 3119 SINGLE_VALUE_TYPE(switches::kEnableExperimentalFullscreenExitUI)}, |
3120 #endif // defined(TOOLKIT_VIEWS) | 3120 #endif // defined(TOOLKIT_VIEWS) |
3121 | 3121 |
3122 {"enable-module-scripts", flag_descriptions::kModuleScriptsName, | 3122 {"enable-module-scripts", flag_descriptions::kModuleScriptsName, |
3123 flag_descriptions::kModuleScriptsDescription, kOsAll, | 3123 flag_descriptions::kModuleScriptsDescription, kOsAll, |
3124 FEATURE_VALUE_TYPE(features::kModuleScripts)}, | 3124 FEATURE_VALUE_TYPE(features::kModuleScripts)}, |
3125 | 3125 |
| 3126 {"network-service", flag_descriptions::kEnableNetworkServiceName, |
| 3127 flag_descriptions::kEnableNetworkServiceDescription, kOsAll, |
| 3128 FEATURE_VALUE_TYPE(features::kNetworkService)}, |
| 3129 |
3126 // NOTE: Adding new command-line switches requires adding corresponding | 3130 // NOTE: Adding new command-line switches requires adding corresponding |
3127 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in | 3131 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in |
3128 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. | 3132 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. |
3129 }; | 3133 }; |
3130 | 3134 |
3131 class FlagsStateSingleton { | 3135 class FlagsStateSingleton { |
3132 public: | 3136 public: |
3133 FlagsStateSingleton() | 3137 FlagsStateSingleton() |
3134 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 3138 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
3135 ~FlagsStateSingleton() {} | 3139 ~FlagsStateSingleton() {} |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3345 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3349 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3346 | 3350 |
3347 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3351 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3348 *count = arraysize(kFeatureEntries); | 3352 *count = arraysize(kFeatureEntries); |
3349 return kFeatureEntries; | 3353 return kFeatureEntries; |
3350 } | 3354 } |
3351 | 3355 |
3352 } // namespace testing | 3356 } // namespace testing |
3353 | 3357 |
3354 } // namespace about_flags | 3358 } // namespace about_flags |
OLD | NEW |