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 3137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3148 flag_descriptions::kSpannableInlineAutocompleteName, | 3148 flag_descriptions::kSpannableInlineAutocompleteName, |
3149 flag_descriptions::kSpannableInlineAutocompleteDescription, kOsAndroid, | 3149 flag_descriptions::kSpannableInlineAutocompleteDescription, kOsAndroid, |
3150 FEATURE_VALUE_TYPE(chrome::android::kSpannableInlineAutocomplete)}, | 3150 FEATURE_VALUE_TYPE(chrome::android::kSpannableInlineAutocomplete)}, |
3151 #endif // defined(OS_ANDROID) | 3151 #endif // defined(OS_ANDROID) |
3152 | 3152 |
3153 {"enable-resource-load-scheduler", | 3153 {"enable-resource-load-scheduler", |
3154 flag_descriptions::kResourceLoadSchedulerName, | 3154 flag_descriptions::kResourceLoadSchedulerName, |
3155 flag_descriptions::kResourceLoadSchedulerDescription, kOsAll, | 3155 flag_descriptions::kResourceLoadSchedulerDescription, kOsAll, |
3156 FEATURE_VALUE_TYPE(features::kResourceLoadScheduler)}, | 3156 FEATURE_VALUE_TYPE(features::kResourceLoadScheduler)}, |
3157 | 3157 |
| 3158 #if defined(OS_ANDROID) |
| 3159 {"omnibox-spare-renderer", flag_descriptions::kOmniboxSpareRendererName, |
| 3160 flag_descriptions::kOmniboxSpareRendererDescription, kOsAndroid, |
| 3161 FEATURE_VALUE_TYPE(chrome::android::kOmniboxSpareRenderer)}, |
| 3162 #endif |
| 3163 |
3158 // NOTE: Adding new command-line switches requires adding corresponding | 3164 // NOTE: Adding new command-line switches requires adding corresponding |
3159 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in | 3165 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in |
3160 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. | 3166 // enums.xml and don't forget to run AboutFlagsHistogramTest unit test. |
3161 }; | 3167 }; |
3162 | 3168 |
3163 class FlagsStateSingleton { | 3169 class FlagsStateSingleton { |
3164 public: | 3170 public: |
3165 FlagsStateSingleton() | 3171 FlagsStateSingleton() |
3166 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 3172 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
3167 ~FlagsStateSingleton() {} | 3173 ~FlagsStateSingleton() {} |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3377 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3383 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3378 | 3384 |
3379 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3385 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3380 *count = arraysize(kFeatureEntries); | 3386 *count = arraysize(kFeatureEntries); |
3381 return kFeatureEntries; | 3387 return kFeatureEntries; |
3382 } | 3388 } |
3383 | 3389 |
3384 } // namespace testing | 3390 } // namespace testing |
3385 | 3391 |
3386 } // namespace about_flags | 3392 } // namespace about_flags |
OLD | NEW |