| 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 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 706 #else | 706 #else |
| 707 { | 707 { |
| 708 "disable-media-source", | 708 "disable-media-source", |
| 709 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME, | 709 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME, |
| 710 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION, | 710 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION, |
| 711 kOsAll, | 711 kOsAll, |
| 712 SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource) | 712 SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource) |
| 713 }, | 713 }, |
| 714 #endif | 714 #endif |
| 715 { | 715 { |
| 716 "enable-encrypted-media", |
| 717 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, |
| 718 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, |
| 719 kOsDesktop, |
| 720 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) |
| 721 }, |
| 722 { |
| 716 "disable-encrypted-media", | 723 "disable-encrypted-media", |
| 717 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME, | 724 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, |
| 718 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION, | 725 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, |
| 719 kOsDesktop, | 726 kOsDesktop, |
| 720 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia) | 727 SINGLE_VALUE_TYPE(switches::kDisableLegacyEncryptedMedia) |
| 721 }, | 728 }, |
| 722 { | 729 { |
| 723 "enable-opus-playback", | 730 "enable-opus-playback", |
| 724 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME, | 731 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME, |
| 725 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION, | 732 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION, |
| 726 kOsDesktop, | 733 kOsDesktop, |
| 727 SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback) | 734 SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback) |
| 728 }, | 735 }, |
| 729 { | 736 { |
| 730 "enable-vp9-playback", | 737 "enable-vp9-playback", |
| (...skipping 1257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1988 } | 1995 } |
| 1989 | 1996 |
| 1990 const Experiment* GetExperiments(size_t* count) { | 1997 const Experiment* GetExperiments(size_t* count) { |
| 1991 *count = num_experiments; | 1998 *count = num_experiments; |
| 1992 return experiments; | 1999 return experiments; |
| 1993 } | 2000 } |
| 1994 | 2001 |
| 1995 } // namespace testing | 2002 } // namespace testing |
| 1996 | 2003 |
| 1997 } // namespace about_flags | 2004 } // namespace about_flags |
| OLD | NEW |