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 2062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2073 IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, | 2073 IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, |
2074 kOsWin | kOsLinux, | 2074 kOsWin | kOsLinux, |
2075 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, | 2075 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, |
2076 switches::kDisableInputImeAPI)}, | 2076 switches::kDisableInputImeAPI)}, |
2077 #endif // defined(OS_WIN) || defined(OS_LINUX) | 2077 #endif // defined(OS_WIN) || defined(OS_LINUX) |
2078 {"enable-experimental-framework", | 2078 {"enable-experimental-framework", |
2079 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_NAME, | 2079 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_NAME, |
2080 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_DESCRIPTION, | 2080 IDS_FLAGS_EXPERIMENTAL_FRAMEWORK_DESCRIPTION, |
2081 kOsAll, | 2081 kOsAll, |
2082 FEATURE_VALUE_TYPE(features::kExperimentalFramework)}, | 2082 FEATURE_VALUE_TYPE(features::kExperimentalFramework)}, |
| 2083 #if defined(OS_ANDROID) |
| 2084 {"enable-unified-media-pipeline", |
| 2085 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_NAME, |
| 2086 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_DESCRIPTION, kOsAndroid, |
| 2087 SINGLE_VALUE_TYPE(switches::kEnableUnifiedMediaPipeline)}, |
| 2088 #endif // OS_ANDROID |
2083 // NOTE: Adding new command-line switches requires adding corresponding | 2089 // NOTE: Adding new command-line switches requires adding corresponding |
2084 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2090 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2085 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2091 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2086 }; | 2092 }; |
2087 | 2093 |
2088 class FlagsStateSingleton { | 2094 class FlagsStateSingleton { |
2089 public: | 2095 public: |
2090 FlagsStateSingleton() | 2096 FlagsStateSingleton() |
2091 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2097 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2092 ~FlagsStateSingleton() {} | 2098 ~FlagsStateSingleton() {} |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2286 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2292 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2287 | 2293 |
2288 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2294 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2289 *count = arraysize(kFeatureEntries); | 2295 *count = arraysize(kFeatureEntries); |
2290 return kFeatureEntries; | 2296 return kFeatureEntries; |
2291 } | 2297 } |
2292 | 2298 |
2293 } // namespace testing | 2299 } // namespace testing |
2294 | 2300 |
2295 } // namespace about_flags | 2301 } // namespace about_flags |
OLD | NEW |