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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 #include "components/signin/core/common/signin_switches.h" | 50 #include "components/signin/core/common/signin_switches.h" |
51 #include "components/sync_driver/sync_driver_switches.h" | 51 #include "components/sync_driver/sync_driver_switches.h" |
52 #include "components/tracing/tracing_switches.h" | 52 #include "components/tracing/tracing_switches.h" |
53 #include "components/version_info/version_info.h" | 53 #include "components/version_info/version_info.h" |
54 #include "content/public/browser/user_metrics.h" | 54 #include "content/public/browser/user_metrics.h" |
55 #include "content/public/common/content_features.h" | 55 #include "content/public/common/content_features.h" |
56 #include "content/public/common/content_switches.h" | 56 #include "content/public/common/content_switches.h" |
57 #include "grit/components_strings.h" | 57 #include "grit/components_strings.h" |
58 #include "media/base/media_switches.h" | 58 #include "media/base/media_switches.h" |
59 #include "media/midi/midi_switches.h" | 59 #include "media/midi/midi_switches.h" |
| 60 #include "net/http/http_features.h" |
60 #include "ui/base/l10n/l10n_util.h" | 61 #include "ui/base/l10n/l10n_util.h" |
61 #include "ui/base/ui_base_switches.h" | 62 #include "ui/base/ui_base_switches.h" |
62 #include "ui/display/display_switches.h" | 63 #include "ui/display/display_switches.h" |
63 #include "ui/events/event_switches.h" | 64 #include "ui/events/event_switches.h" |
64 #include "ui/gfx/switches.h" | 65 #include "ui/gfx/switches.h" |
65 #include "ui/gl/gl_switches.h" | 66 #include "ui/gl/gl_switches.h" |
66 #include "ui/keyboard/keyboard_switches.h" | 67 #include "ui/keyboard/keyboard_switches.h" |
67 #include "ui/native_theme/native_theme_switches.h" | 68 #include "ui/native_theme/native_theme_switches.h" |
68 #include "ui/views/views_switches.h" | 69 #include "ui/views/views_switches.h" |
69 | 70 |
(...skipping 2006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2076 IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, | 2077 IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, |
2077 kOsWin | kOsLinux, | 2078 kOsWin | kOsLinux, |
2078 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, | 2079 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, |
2079 switches::kDisableInputImeAPI)}, | 2080 switches::kDisableInputImeAPI)}, |
2080 #endif // defined(OS_WIN) || defined(OS_LINUX) | 2081 #endif // defined(OS_WIN) || defined(OS_LINUX) |
2081 {"enable-experimental-framework", | 2082 {"enable-experimental-framework", |
2082 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_NAME, | 2083 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_NAME, |
2083 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_DESCRIPTION, | 2084 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_DESCRIPTION, |
2084 kOsAll, | 2085 kOsAll, |
2085 FEATURE_VALUE_TYPE(features::kExperimentalFramework)}, | 2086 FEATURE_VALUE_TYPE(features::kExperimentalFramework)}, |
| 2087 {"enable-brotli", |
| 2088 IDS_FLAGS_ENABLE_BROTLI_NAME, |
| 2089 IDS_FLAGS_ENABLE_BROTLI_DESCRIPTION, |
| 2090 kOsAll, |
| 2091 FEATURE_VALUE_TYPE(net::features::kBrotliEncodingFeature)}, |
2086 #if defined(OS_ANDROID) | 2092 #if defined(OS_ANDROID) |
2087 {"enable-unified-media-pipeline", | 2093 {"enable-unified-media-pipeline", |
2088 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_NAME, | 2094 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_NAME, |
2089 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_DESCRIPTION, kOsAndroid, | 2095 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_DESCRIPTION, kOsAndroid, |
2090 SINGLE_VALUE_TYPE(switches::kEnableUnifiedMediaPipeline)}, | 2096 SINGLE_VALUE_TYPE(switches::kEnableUnifiedMediaPipeline)}, |
2091 #endif // OS_ANDROID | 2097 #endif // OS_ANDROID |
2092 // NOTE: Adding new command-line switches requires adding corresponding | 2098 // NOTE: Adding new command-line switches requires adding corresponding |
2093 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2099 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2094 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2100 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2095 }; | 2101 }; |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2295 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2301 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2296 | 2302 |
2297 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2303 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2298 *count = arraysize(kFeatureEntries); | 2304 *count = arraysize(kFeatureEntries); |
2299 return kFeatureEntries; | 2305 return kFeatureEntries; |
2300 } | 2306 } |
2301 | 2307 |
2302 } // namespace testing | 2308 } // namespace testing |
2303 | 2309 |
2304 } // namespace about_flags | 2310 } // namespace about_flags |
OLD | NEW |