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 3086 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3097 {"browser-side-navigation", flag_descriptions::kBrowserSideNavigationName, | 3097 {"browser-side-navigation", flag_descriptions::kBrowserSideNavigationName, |
3098 flag_descriptions::kBrowserSideNavigationDescription, kOsAll, | 3098 flag_descriptions::kBrowserSideNavigationDescription, kOsAll, |
3099 FEATURE_VALUE_TYPE(features::kBrowserSideNavigation)}, | 3099 FEATURE_VALUE_TYPE(features::kBrowserSideNavigation)}, |
3100 | 3100 |
3101 #if defined(OS_MACOSX) | 3101 #if defined(OS_MACOSX) |
3102 {"mac-touchbar", flag_descriptions::kMacTouchBarName, | 3102 {"mac-touchbar", flag_descriptions::kMacTouchBarName, |
3103 flag_descriptions::kMacTouchBarDescription, kOsMac, | 3103 flag_descriptions::kMacTouchBarDescription, kOsMac, |
3104 FEATURE_VALUE_TYPE(features::kBrowserTouchBar)}, | 3104 FEATURE_VALUE_TYPE(features::kBrowserTouchBar)}, |
3105 #endif // defined(OS_MACOSX) | 3105 #endif // defined(OS_MACOSX) |
3106 | 3106 |
| 3107 {"network-service", flag_descriptions::kEnableNetworkServiceName, |
| 3108 flag_descriptions::kEnableNetworkServiceDescription, kOsAll, |
| 3109 FEATURE_VALUE_TYPE(features::kNetworkService)}, |
| 3110 |
3107 // NOTE: Adding new command-line switches requires adding corresponding | 3111 // NOTE: Adding new command-line switches requires adding corresponding |
3108 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in | 3112 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in |
3109 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. | 3113 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. |
3110 }; | 3114 }; |
3111 | 3115 |
3112 class FlagsStateSingleton { | 3116 class FlagsStateSingleton { |
3113 public: | 3117 public: |
3114 FlagsStateSingleton() | 3118 FlagsStateSingleton() |
3115 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 3119 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
3116 ~FlagsStateSingleton() {} | 3120 ~FlagsStateSingleton() {} |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3326 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3330 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3327 | 3331 |
3328 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3332 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3329 *count = arraysize(kFeatureEntries); | 3333 *count = arraysize(kFeatureEntries); |
3330 return kFeatureEntries; | 3334 return kFeatureEntries; |
3331 } | 3335 } |
3332 | 3336 |
3333 } // namespace testing | 3337 } // namespace testing |
3334 | 3338 |
3335 } // namespace about_flags | 3339 } // namespace about_flags |
OLD | NEW |