| 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 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 679 switches::kDisableAsyncDns) | 679 switches::kDisableAsyncDns) |
| 680 }, | 680 }, |
| 681 { | 681 { |
| 682 "disable-media-source", | 682 "disable-media-source", |
| 683 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME, | 683 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_NAME, |
| 684 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION, | 684 IDS_FLAGS_DISABLE_WEBKIT_MEDIA_SOURCE_DESCRIPTION, |
| 685 kOsAll, | 685 kOsAll, |
| 686 SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource) | 686 SINGLE_VALUE_TYPE(switches::kDisableWebKitMediaSource) |
| 687 }, | 687 }, |
| 688 { | 688 { |
| 689 "enable-encrypted-media", |
| 690 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_NAME, |
| 691 IDS_FLAGS_ENABLE_ENCRYPTED_MEDIA_DESCRIPTION, |
| 692 kOsDesktop, |
| 693 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) |
| 694 }, |
| 695 { |
| 689 "disable-encrypted-media", | 696 "disable-encrypted-media", |
| 690 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME, | 697 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, |
| 691 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION, | 698 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, |
| 692 kOsDesktop, | 699 kOsDesktop, |
| 693 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia) | 700 SINGLE_VALUE_TYPE(switches::kDisableLegacyEncryptedMedia) |
| 694 }, | 701 }, |
| 695 { | 702 { |
| 696 "enable-opus-playback", | 703 "enable-opus-playback", |
| 697 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME, | 704 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_NAME, |
| 698 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION, | 705 IDS_FLAGS_ENABLE_OPUS_PLAYBACK_DESCRIPTION, |
| 699 kOsDesktop, | 706 kOsDesktop, |
| 700 SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback) | 707 SINGLE_VALUE_TYPE(switches::kEnableOpusPlayback) |
| 701 }, | 708 }, |
| 702 { | 709 { |
| 703 "enable-vp9-playback", | 710 "enable-vp9-playback", |
| (...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1940 } | 1947 } |
| 1941 | 1948 |
| 1942 const Experiment* GetExperiments(size_t* count) { | 1949 const Experiment* GetExperiments(size_t* count) { |
| 1943 *count = num_experiments; | 1950 *count = num_experiments; |
| 1944 return experiments; | 1951 return experiments; |
| 1945 } | 1952 } |
| 1946 | 1953 |
| 1947 } // namespace testing | 1954 } // namespace testing |
| 1948 | 1955 |
| 1949 } // namespace about_flags | 1956 } // namespace about_flags |
| OLD | NEW |