| 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 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 830 }, | 830 }, |
| 831 { | 831 { |
| 832 "mediadrm-enable-non-compositing", | 832 "mediadrm-enable-non-compositing", |
| 833 IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_NAME, | 833 IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_NAME, |
| 834 IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_DESCRIPTION, | 834 IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_DESCRIPTION, |
| 835 kOsAndroid, | 835 kOsAndroid, |
| 836 SINGLE_VALUE_TYPE(switches::kMediaDrmEnableNonCompositing) | 836 SINGLE_VALUE_TYPE(switches::kMediaDrmEnableNonCompositing) |
| 837 }, | 837 }, |
| 838 #endif // defined(OS_ANDROID) | 838 #endif // defined(OS_ANDROID) |
| 839 { | 839 { |
| 840 "disable-opus-playback", | |
| 841 IDS_FLAGS_DISABLE_OPUS_PLAYBACK_NAME, | |
| 842 IDS_FLAGS_DISABLE_OPUS_PLAYBACK_DESCRIPTION, | |
| 843 kOsDesktop, | |
| 844 SINGLE_VALUE_TYPE(switches::kDisableOpusPlayback) | |
| 845 }, | |
| 846 { | |
| 847 "disable-vp8-alpha-playback", | |
| 848 IDS_FLAGS_DISABLE_VP8_ALPHA_PLAYBACK_NAME, | |
| 849 IDS_FLAGS_DISABLE_VP8_ALPHA_PLAYBACK_DESCRIPTION, | |
| 850 kOsDesktop, | |
| 851 SINGLE_VALUE_TYPE(switches::kDisableVp8AlphaPlayback) | |
| 852 }, | |
| 853 { | |
| 854 "enable-javascript-harmony", | 840 "enable-javascript-harmony", |
| 855 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, | 841 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, |
| 856 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION, | 842 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION, |
| 857 kOsAll, | 843 kOsAll, |
| 858 SINGLE_VALUE_TYPE_AND_VALUE(switches::kJavaScriptFlags, "--harmony") | 844 SINGLE_VALUE_TYPE_AND_VALUE(switches::kJavaScriptFlags, "--harmony") |
| 859 }, | 845 }, |
| 860 { | 846 { |
| 861 "disable-restore-session-state", | 847 "disable-restore-session-state", |
| 862 IDS_FLAGS_DISABLE_RESTORE_SESSION_STATE_NAME, | 848 IDS_FLAGS_DISABLE_RESTORE_SESSION_STATE_NAME, |
| 863 IDS_FLAGS_DISABLE_RESTORE_SESSION_STATE_DESCRIPTION, | 849 IDS_FLAGS_DISABLE_RESTORE_SESSION_STATE_DESCRIPTION, |
| (...skipping 1557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2421 } | 2407 } |
| 2422 | 2408 |
| 2423 const Experiment* GetExperiments(size_t* count) { | 2409 const Experiment* GetExperiments(size_t* count) { |
| 2424 *count = num_experiments; | 2410 *count = num_experiments; |
| 2425 return experiments; | 2411 return experiments; |
| 2426 } | 2412 } |
| 2427 | 2413 |
| 2428 } // namespace testing | 2414 } // namespace testing |
| 2429 | 2415 |
| 2430 } // namespace about_flags | 2416 } // namespace about_flags |
| OLD | NEW |