| 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 705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 716 kOsAll, | 716 kOsAll, |
| 717 SINGLE_VALUE_TYPE(switches::kEnableSpdy4) | 717 SINGLE_VALUE_TYPE(switches::kEnableSpdy4) |
| 718 }, | 718 }, |
| 719 { | 719 { |
| 720 "disable-media-source", | 720 "disable-media-source", |
| 721 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, | 721 IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME, |
| 722 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, | 722 IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION, |
| 723 kOsAll, | 723 kOsAll, |
| 724 SINGLE_VALUE_TYPE(switches::kDisableMediaSource) | 724 SINGLE_VALUE_TYPE(switches::kDisableMediaSource) |
| 725 }, | 725 }, |
| 726 #if defined(OS_ANDROID) |
| 727 { |
| 728 "enable-media-player-v2", |
| 729 IDS_FLAGS_ENABLE_MEDIA_PLAYER_V2_NAME, |
| 730 IDS_FLAGS_ENABLE_MEDIA_PLAYER_V2_DESCRIPTION, |
| 731 kOsAndroid, |
| 732 SINGLE_VALUE_TYPE(switches::kEnableMediaPlayerV2) |
| 733 }, |
| 734 #endif // defined(OS_ANDROID) |
| 726 { | 735 { |
| 727 "disable-encrypted-media", | 736 "disable-encrypted-media", |
| 728 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME, | 737 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME, |
| 729 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION, | 738 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION, |
| 730 kOsAll, | 739 kOsAll, |
| 731 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia) | 740 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia) |
| 732 }, | 741 }, |
| 733 { | 742 { |
| 734 "disable-prefixed-encrypted-media", | 743 "disable-prefixed-encrypted-media", |
| 735 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, | 744 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, |
| (...skipping 2164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2900 } | 2909 } |
| 2901 | 2910 |
| 2902 const Experiment* GetExperiments(size_t* count) { | 2911 const Experiment* GetExperiments(size_t* count) { |
| 2903 *count = num_experiments; | 2912 *count = num_experiments; |
| 2904 return experiments; | 2913 return experiments; |
| 2905 } | 2914 } |
| 2906 | 2915 |
| 2907 } // namespace testing | 2916 } // namespace testing |
| 2908 | 2917 |
| 2909 } // namespace about_flags | 2918 } // namespace about_flags |
| OLD | NEW |