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 3141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3152 flag_descriptions::kSpannableInlineAutocompleteName, | 3152 flag_descriptions::kSpannableInlineAutocompleteName, |
3153 flag_descriptions::kSpannableInlineAutocompleteDescription, kOsAndroid, | 3153 flag_descriptions::kSpannableInlineAutocompleteDescription, kOsAndroid, |
3154 FEATURE_VALUE_TYPE(chrome::android::kSpannableInlineAutocomplete)}, | 3154 FEATURE_VALUE_TYPE(chrome::android::kSpannableInlineAutocomplete)}, |
3155 #endif // defined(OS_ANDROID) | 3155 #endif // defined(OS_ANDROID) |
3156 | 3156 |
3157 {"enable-resource-load-scheduler", | 3157 {"enable-resource-load-scheduler", |
3158 flag_descriptions::kResourceLoadSchedulerName, | 3158 flag_descriptions::kResourceLoadSchedulerName, |
3159 flag_descriptions::kResourceLoadSchedulerDescription, kOsAll, | 3159 flag_descriptions::kResourceLoadSchedulerDescription, kOsAll, |
3160 FEATURE_VALUE_TYPE(features::kResourceLoadScheduler)}, | 3160 FEATURE_VALUE_TYPE(features::kResourceLoadScheduler)}, |
3161 | 3161 |
| 3162 #if defined(OS_ANDROID) |
| 3163 {"omnibox-spare-renderer", flag_descriptions::kOmniboxSpareRendererName, |
| 3164 flag_descriptions::kOmniboxSpareRendererDescription, kOsAndroid, |
| 3165 FEATURE_VALUE_TYPE(chrome::android::kOmniboxSpareRenderer)}, |
| 3166 #endif |
| 3167 |
3162 #if defined(TOOLKIT_VIEWS) | 3168 #if defined(TOOLKIT_VIEWS) |
3163 {"delay-reload-stop-button-change", | 3169 {"delay-reload-stop-button-change", |
3164 flag_descriptions::kDelayReloadStopButtonChangeName, | 3170 flag_descriptions::kDelayReloadStopButtonChangeName, |
3165 flag_descriptions::kDelayReloadStopButtonChangeDescription, | 3171 flag_descriptions::kDelayReloadStopButtonChangeDescription, |
3166 kOsCrOS | kOsWin | kOsLinux, | 3172 kOsCrOS | kOsWin | kOsLinux, |
3167 SINGLE_DISABLE_VALUE_TYPE(switches::kDelayReloadStopButtonChange)}, | 3173 SINGLE_DISABLE_VALUE_TYPE(switches::kDelayReloadStopButtonChange)}, |
3168 #endif // TOOLKIT_VIEWS | 3174 #endif // TOOLKIT_VIEWS |
3169 | 3175 |
3170 // NOTE: Adding new command-line switches requires adding corresponding | 3176 // NOTE: Adding new command-line switches requires adding corresponding |
3171 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in | 3177 // entries to enum "LoginCustomFlags" in histograms/enums.xml. See note in |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3389 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3395 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3390 | 3396 |
3391 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3397 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3392 *count = arraysize(kFeatureEntries); | 3398 *count = arraysize(kFeatureEntries); |
3393 return kFeatureEntries; | 3399 return kFeatureEntries; |
3394 } | 3400 } |
3395 | 3401 |
3396 } // namespace testing | 3402 } // namespace testing |
3397 | 3403 |
3398 } // namespace about_flags | 3404 } // namespace about_flags |
OLD | NEW |