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 2050 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2061 kOsDesktop, | 2061 kOsDesktop, |
2062 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)}, | 2062 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)}, |
2063 #endif | 2063 #endif |
2064 #if defined(OS_WIN) || defined(OS_LINUX) | 2064 #if defined(OS_WIN) || defined(OS_LINUX) |
2065 {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME, | 2065 {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME, |
2066 IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, | 2066 IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, |
2067 kOsWin | kOsLinux, | 2067 kOsWin | kOsLinux, |
2068 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, | 2068 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, |
2069 switches::kDisableInputImeAPI)}, | 2069 switches::kDisableInputImeAPI)}, |
2070 #endif // defined(OS_WIN) || defined(OS_LINUX) | 2070 #endif // defined(OS_WIN) || defined(OS_LINUX) |
| 2071 #if defined(OS_ANDROID) |
| 2072 {"enable-unified-media-pipeline", |
| 2073 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_NAME, |
| 2074 IDS_FLAGS_ENABLE_UNIFIED_MEDIA_PIPELINE_DESCRIPTION, kOsAndroid, |
| 2075 SINGLE_VALUE_TYPE(switches::kEnableUnifiedMediaPipeline)}, |
| 2076 #endif // OS_ANDROID |
2071 // NOTE: Adding new command-line switches requires adding corresponding | 2077 // NOTE: Adding new command-line switches requires adding corresponding |
2072 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2078 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2073 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2079 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2074 }; | 2080 }; |
2075 | 2081 |
2076 class FlagsStateSingleton { | 2082 class FlagsStateSingleton { |
2077 public: | 2083 public: |
2078 FlagsStateSingleton() | 2084 FlagsStateSingleton() |
2079 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2085 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2080 ~FlagsStateSingleton() {} | 2086 ~FlagsStateSingleton() {} |
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2274 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2280 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2275 | 2281 |
2276 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2282 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2277 *count = arraysize(kFeatureEntries); | 2283 *count = arraysize(kFeatureEntries); |
2278 return kFeatureEntries; | 2284 return kFeatureEntries; |
2279 } | 2285 } |
2280 | 2286 |
2281 } // namespace testing | 2287 } // namespace testing |
2282 | 2288 |
2283 } // namespace about_flags | 2289 } // namespace about_flags |
OLD | NEW |