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 2067 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2078 IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, | 2078 IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, |
2079 kOsWin | kOsLinux, | 2079 kOsWin | kOsLinux, |
2080 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, | 2080 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, |
2081 switches::kDisableInputImeAPI)}, | 2081 switches::kDisableInputImeAPI)}, |
2082 #endif // defined(OS_WIN) || defined(OS_LINUX) | 2082 #endif // defined(OS_WIN) || defined(OS_LINUX) |
2083 {"enable-experimental-framework", | 2083 {"enable-experimental-framework", |
2084 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_NAME, | 2084 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_NAME, |
2085 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_DESCRIPTION, | 2085 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_DESCRIPTION, |
2086 kOsAll, | 2086 kOsAll, |
2087 FEATURE_VALUE_TYPE(features::kExperimentalFramework)}, | 2087 FEATURE_VALUE_TYPE(features::kExperimentalFramework)}, |
| 2088 {"enable-brotli", |
| 2089 IDS_FLAGS_ENABLE_BROTLI_NAME, |
| 2090 IDS_FLAGS_ENABLE_BROTLI_DESCRIPTION, |
| 2091 kOsAll, |
| 2092 FEATURE_VALUE_TYPE(features::kBrotliEncoding)}, |
2088 #if defined(OS_ANDROID) | 2093 #if defined(OS_ANDROID) |
2089 {"enable-unified-media-pipeline", | 2094 {"enable-unified-media-pipeline", |
2090 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_NAME, | 2095 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_NAME, |
2091 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_DESCRIPTION, kOsAndroid, | 2096 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_DESCRIPTION, kOsAndroid, |
2092 SINGLE_VALUE_TYPE(switches::kEnableUnifiedMediaPipeline)}, | 2097 SINGLE_VALUE_TYPE(switches::kEnableUnifiedMediaPipeline)}, |
2093 #endif // OS_ANDROID | 2098 #endif // OS_ANDROID |
2094 // NOTE: Adding new command-line switches requires adding corresponding | 2099 // NOTE: Adding new command-line switches requires adding corresponding |
2095 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2100 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2096 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2101 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2097 }; | 2102 }; |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2297 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2302 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2298 | 2303 |
2299 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2304 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2300 *count = arraysize(kFeatureEntries); | 2305 *count = arraysize(kFeatureEntries); |
2301 return kFeatureEntries; | 2306 return kFeatureEntries; |
2302 } | 2307 } |
2303 | 2308 |
2304 } // namespace testing | 2309 } // namespace testing |
2305 | 2310 |
2306 } // namespace about_flags | 2311 } // namespace about_flags |
OLD | NEW |