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 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
787 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME, | 787 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME, |
788 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION, | 788 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION, |
789 #if defined(ENABLE_SWIFTSHADER) | 789 #if defined(ENABLE_SWIFTSHADER) |
790 kOsAll, | 790 kOsAll, |
791 #else | 791 #else |
792 0, | 792 0, |
793 #endif | 793 #endif |
794 SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer) | 794 SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer) |
795 }, | 795 }, |
796 { | 796 { |
797 "enable-experimental-webkit-features", | 797 "enable-experimental-web-platform-features", |
798 IDS_FLAGS_EXPERIMENTAL_WEBKIT_FEATURES_NAME, | 798 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME, |
799 IDS_FLAGS_EXPERIMENTAL_WEBKIT_FEATURES_DESCRIPTION, | 799 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, |
800 kOsAll, | 800 kOsAll, |
801 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebKitFeatures) | 801 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures) |
802 }, | 802 }, |
803 { | 803 { |
804 "enable-css-shaders", | 804 "enable-css-shaders", |
805 IDS_FLAGS_CSS_SHADERS_NAME, | 805 IDS_FLAGS_CSS_SHADERS_NAME, |
806 IDS_FLAGS_CSS_SHADERS_DESCRIPTION, | 806 IDS_FLAGS_CSS_SHADERS_DESCRIPTION, |
807 kOsAll, | 807 kOsAll, |
808 SINGLE_VALUE_TYPE(switches::kEnableCssShaders) | 808 SINGLE_VALUE_TYPE(switches::kEnableCssShaders) |
809 }, | 809 }, |
810 { | 810 { |
811 "enable-extension-activity-ui", | 811 "enable-extension-activity-ui", |
(...skipping 1141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1953 } | 1953 } |
1954 | 1954 |
1955 const Experiment* GetExperiments(size_t* count) { | 1955 const Experiment* GetExperiments(size_t* count) { |
1956 *count = num_experiments; | 1956 *count = num_experiments; |
1957 return experiments; | 1957 return experiments; |
1958 } | 1958 } |
1959 | 1959 |
1960 } // namespace testing | 1960 } // namespace testing |
1961 | 1961 |
1962 } // namespace about_flags | 1962 } // namespace about_flags |
OLD | NEW |