| 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 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_DESCRIPTION, | 803 IDS_FLAGS_MEDIADRM_ENABLE_NON_COMPOSITING_DESCRIPTION, |
| 804 kOsAndroid, | 804 kOsAndroid, |
| 805 SINGLE_VALUE_TYPE(switches::kMediaDrmEnableNonCompositing) | 805 SINGLE_VALUE_TYPE(switches::kMediaDrmEnableNonCompositing) |
| 806 }, | 806 }, |
| 807 #endif // defined(OS_ANDROID) | 807 #endif // defined(OS_ANDROID) |
| 808 { | 808 { |
| 809 "enable-javascript-harmony", | 809 "enable-javascript-harmony", |
| 810 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, | 810 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME, |
| 811 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION, | 811 IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION, |
| 812 kOsAll, | 812 kOsAll, |
| 813 SINGLE_VALUE_TYPE(switches::kJavaScriptHarmony) | 813 SINGLE_VALUE_TYPE_AND_VALUE(switches::kJavaScriptFlags, "--harmony") |
| 814 }, | 814 }, |
| 815 { | 815 { |
| 816 "disable-software-rasterizer", | 816 "disable-software-rasterizer", |
| 817 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME, | 817 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME, |
| 818 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION, | 818 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION, |
| 819 #if defined(ENABLE_SWIFTSHADER) | 819 #if defined(ENABLE_SWIFTSHADER) |
| 820 kOsAll, | 820 kOsAll, |
| 821 #else | 821 #else |
| 822 0, | 822 0, |
| 823 #endif | 823 #endif |
| (...skipping 1669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2493 } | 2493 } |
| 2494 | 2494 |
| 2495 const Experiment* GetExperiments(size_t* count) { | 2495 const Experiment* GetExperiments(size_t* count) { |
| 2496 *count = num_experiments; | 2496 *count = num_experiments; |
| 2497 return experiments; | 2497 return experiments; |
| 2498 } | 2498 } |
| 2499 | 2499 |
| 2500 } // namespace testing | 2500 } // namespace testing |
| 2501 | 2501 |
| 2502 } // namespace about_flags | 2502 } // namespace about_flags |
| OLD | NEW |