| 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 698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 {"disable-encrypted-media", | 709 {"disable-encrypted-media", |
| 710 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME, | 710 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME, |
| 711 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION, | 711 IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION, |
| 712 kOsAll, | 712 kOsAll, |
| 713 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia)}, | 713 SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia)}, |
| 714 {"disable-prefixed-encrypted-media", | 714 {"disable-prefixed-encrypted-media", |
| 715 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, | 715 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_NAME, |
| 716 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, | 716 IDS_FLAGS_DISABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION, |
| 717 kOsAll, | 717 kOsAll, |
| 718 SINGLE_VALUE_TYPE(switches::kDisablePrefixedEncryptedMedia)}, | 718 SINGLE_VALUE_TYPE(switches::kDisablePrefixedEncryptedMedia)}, |
| 719 #if defined(OS_ANDROID) | |
| 720 {"disable-infobar-for-protected-media-identifier", | |
| 721 IDS_FLAGS_DISABLE_INFOBAR_FOR_PROTECTED_MEDIA_IDENTIFIER_NAME, | |
| 722 IDS_FLAGS_DISABLE_INFOBAR_FOR_PROTECTED_MEDIA_IDENTIFIER_DESCRIPTION, | |
| 723 kOsAndroid, | |
| 724 SINGLE_VALUE_TYPE(switches::kDisableInfobarForProtectedMediaIdentifier)}, | |
| 725 #endif // defined(OS_ANDROID) | |
| 726 {"disable-javascript-harmony-shipping", | 719 {"disable-javascript-harmony-shipping", |
| 727 IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_NAME, | 720 IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_NAME, |
| 728 IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION, | 721 IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION, |
| 729 kOsAll, | 722 kOsAll, |
| 730 SINGLE_VALUE_TYPE(switches::kDisableJavaScriptHarmonyShipping)}, | 723 SINGLE_VALUE_TYPE(switches::kDisableJavaScriptHarmonyShipping)}, |
| 731 {"enable-javascript-harmony", | 724 {"enable-javascript-harmony", |
| 732 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, | 725 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, |
| 733 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION, | 726 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION, |
| 734 kOsAll, | 727 kOsAll, |
| 735 SINGLE_VALUE_TYPE(switches::kJavaScriptHarmony)}, | 728 SINGLE_VALUE_TYPE(switches::kJavaScriptHarmony)}, |
| (...skipping 1851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2587 } | 2580 } |
| 2588 | 2581 |
| 2589 const Experiment* GetExperiments(size_t* count) { | 2582 const Experiment* GetExperiments(size_t* count) { |
| 2590 *count = num_experiments; | 2583 *count = num_experiments; |
| 2591 return experiments; | 2584 return experiments; |
| 2592 } | 2585 } |
| 2593 | 2586 |
| 2594 } // namespace testing | 2587 } // namespace testing |
| 2595 | 2588 |
| 2596 } // namespace about_flags | 2589 } // namespace about_flags |
| OLD | NEW |