| 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 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 882 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME, | 882 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME, |
| 883 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION, | 883 IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION, |
| 884 #if defined(ENABLE_SWIFTSHADER) | 884 #if defined(ENABLE_SWIFTSHADER) |
| 885 kOsAll, | 885 kOsAll, |
| 886 #else | 886 #else |
| 887 0, | 887 0, |
| 888 #endif | 888 #endif |
| 889 SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer) | 889 SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer) |
| 890 }, | 890 }, |
| 891 { | 891 { |
| 892 "enable-experimental-webkit-features", | 892 "enable-experimental-web-platform-features", |
| 893 IDS_FLAGS_EXPERIMENTAL_WEBKIT_FEATURES_NAME, | 893 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME, |
| 894 IDS_FLAGS_EXPERIMENTAL_WEBKIT_FEATURES_DESCRIPTION, | 894 IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION, |
| 895 kOsAll, | 895 kOsAll, |
| 896 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebKitFeatures) | 896 SINGLE_VALUE_TYPE(switches::kEnableExperimentalWebPlatformFeatures) |
| 897 }, | 897 }, |
| 898 { | 898 { |
| 899 "enable-css-shaders", | 899 "enable-css-shaders", |
| 900 IDS_FLAGS_CSS_SHADERS_NAME, | 900 IDS_FLAGS_CSS_SHADERS_NAME, |
| 901 IDS_FLAGS_CSS_SHADERS_DESCRIPTION, | 901 IDS_FLAGS_CSS_SHADERS_DESCRIPTION, |
| 902 kOsAll, | 902 kOsAll, |
| 903 SINGLE_VALUE_TYPE(switches::kEnableCssShaders) | 903 SINGLE_VALUE_TYPE(switches::kEnableCssShaders) |
| 904 }, | 904 }, |
| 905 { | 905 { |
| 906 "disable-ntp-other-sessions-menu", | 906 "disable-ntp-other-sessions-menu", |
| (...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2113 } | 2113 } |
| 2114 | 2114 |
| 2115 const Experiment* GetExperiments(size_t* count) { | 2115 const Experiment* GetExperiments(size_t* count) { |
| 2116 *count = num_experiments; | 2116 *count = num_experiments; |
| 2117 return experiments; | 2117 return experiments; |
| 2118 } | 2118 } |
| 2119 | 2119 |
| 2120 } // namespace testing | 2120 } // namespace testing |
| 2121 | 2121 |
| 2122 } // namespace about_flags | 2122 } // namespace about_flags |
| OLD | NEW |