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 <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
748 kOsAll, | 748 kOsAll, |
749 SINGLE_VALUE_TYPE(switches::kDisableLegacyEncryptedMedia) | 749 SINGLE_VALUE_TYPE(switches::kDisableLegacyEncryptedMedia) |
750 }, | 750 }, |
751 { | 751 { |
752 "override-encrypted-media-canplaytype", | 752 "override-encrypted-media-canplaytype", |
753 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_NAME, | 753 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_NAME, |
754 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_DESCRIPTION, | 754 IDS_FLAGS_ENCRYPTED_MEDIA_CANPLAYTYPE_OVERRIDE_DESCRIPTION, |
755 kOsMac | kOsWin | kOsAndroid, | 755 kOsMac | kOsWin | kOsAndroid, |
756 SINGLE_VALUE_TYPE(switches::kOverrideEncryptedMediaCanPlayType) | 756 SINGLE_VALUE_TYPE(switches::kOverrideEncryptedMediaCanPlayType) |
757 }, | 757 }, |
| 758 #if defined(OS_ANDROID) |
| 759 { |
| 760 "mediadrm-enable-non-compositing", |
| 761 IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_NAME, |
| 762 IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_DESCRIPTION, |
| 763 kOsAndroid, |
| 764 SINGLE_VALUE_TYPE(switches::kMediaDrmEnableNonCompositing) |
| 765 }, |
| 766 #endif // defined(OS_ANDROID) |
758 { | 767 { |
759 "enable-opus-playback", | 768 "enable-opus-playback", |
760 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME, | 769 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME, |
761 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION, | 770 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION, |
762 kOsDesktop, | 771 kOsDesktop, |
763 SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback) | 772 SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback) |
764 }, | 773 }, |
765 { | 774 { |
766 "disable-vp8-alpha-playback", | 775 "disable-vp8-alpha-playback", |
767 IDS_FLAGS_DISABLE_VP8_ALPHA_PLAYBACK_NAME, | 776 IDS_FLAGS_DISABLE_VP8_ALPHA_PLAYBACK_NAME, |
(...skipping 1364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2132 } | 2141 } |
2133 | 2142 |
2134 const Experiment* GetExperiments(size_t* count) { | 2143 const Experiment* GetExperiments(size_t* count) { |
2135 *count = num_experiments; | 2144 *count = num_experiments; |
2136 return experiments; | 2145 return experiments; |
2137 } | 2146 } |
2138 | 2147 |
2139 } // namespace testing | 2148 } // namespace testing |
2140 | 2149 |
2141 } // namespace about_flags | 2150 } // namespace about_flags |
OLD | NEW |