| 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 2054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2065 {"enumerate-audio-devices", IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_NAME, | 2065 {"enumerate-audio-devices", IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_NAME, |
| 2066 IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_DESCRIPTION, kOsCrOS, | 2066 IDS_FLAGS_ENABLE_ENUMERATING_AUDIO_DEVICES_DESCRIPTION, kOsCrOS, |
| 2067 FEATURE_VALUE_TYPE(features::kEnumerateAudioDevices)}, | 2067 FEATURE_VALUE_TYPE(features::kEnumerateAudioDevices)}, |
| 2068 #endif // OS_CHROMEOS | 2068 #endif // OS_CHROMEOS |
| 2069 #if !defined(OS_ANDROID) | 2069 #if !defined(OS_ANDROID) |
| 2070 {"enable-default-media-session", | 2070 {"enable-default-media-session", |
| 2071 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_NAME, | 2071 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_NAME, |
| 2072 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DESCRIPTION, kOsDesktop, | 2072 IDS_FLAGS_ENABLE_DEFAULT_MEDIA_SESSION_DESCRIPTION, kOsDesktop, |
| 2073 MULTI_VALUE_TYPE(kEnableDefaultMediaSessionChoices)}, | 2073 MULTI_VALUE_TYPE(kEnableDefaultMediaSessionChoices)}, |
| 2074 #endif // !defined(OS_ANDROID) | 2074 #endif // !defined(OS_ANDROID) |
| 2075 #if defined(OS_ANDROID) |
| 2076 {"no-card-abort", IDS_FLAGS_NO_CARD_ABORT, |
| 2077 IDS_FLAGS_NO_CARD_ABORT_DESCRIPTION, kOsAndroid, |
| 2078 FEATURE_VALUE_TYPE(chrome::android::kNoCreditCardAbort)}, |
| 2079 #endif // OS_ANDROID |
| 2075 // NOTE: Adding new command-line switches requires adding corresponding | 2080 // NOTE: Adding new command-line switches requires adding corresponding |
| 2076 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2081 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 2077 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2082 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 2078 }; | 2083 }; |
| 2079 | 2084 |
| 2080 class FlagsStateSingleton { | 2085 class FlagsStateSingleton { |
| 2081 public: | 2086 public: |
| 2082 FlagsStateSingleton() | 2087 FlagsStateSingleton() |
| 2083 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2088 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
| 2084 ~FlagsStateSingleton() {} | 2089 ~FlagsStateSingleton() {} |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2273 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2278 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
| 2274 | 2279 |
| 2275 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2280 const FeatureEntry* GetFeatureEntries(size_t* count) { |
| 2276 *count = arraysize(kFeatureEntries); | 2281 *count = arraysize(kFeatureEntries); |
| 2277 return kFeatureEntries; | 2282 return kFeatureEntries; |
| 2278 } | 2283 } |
| 2279 | 2284 |
| 2280 } // namespace testing | 2285 } // namespace testing |
| 2281 | 2286 |
| 2282 } // namespace about_flags | 2287 } // namespace about_flags |
| OLD | NEW |