| 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 SINGLE_VALUE_TYPE(switches::kForceCompositingMode) | 190 SINGLE_VALUE_TYPE(switches::kForceCompositingMode) |
| 191 }, | 191 }, |
| 192 { | 192 { |
| 193 "threaded-compositing-mode", | 193 "threaded-compositing-mode", |
| 194 IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME, | 194 IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME, |
| 195 IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION, | 195 IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION, |
| 196 kOsAll, | 196 kOsAll, |
| 197 MULTI_VALUE_TYPE(kThreadedCompositingModeChoices) | 197 MULTI_VALUE_TYPE(kThreadedCompositingModeChoices) |
| 198 }, | 198 }, |
| 199 { | 199 { |
| 200 "disable-threaded-animation", | 200 "enable-accelerated-animation", |
| 201 IDS_FLAGS_DISABLE_THREADED_ANIMATION_NAME, | 201 IDS_FLAGS_ENABLE_ACCELERATED_ANIMATION_NAME, |
| 202 IDS_FLAGS_DISABLE_THREADED_ANIMATION_DESCRIPTION, | 202 IDS_FLAGS_ENABLE_ACCELERATED_ANIMATION_DESCRIPTION, |
| 203 kOsAll, | 203 kOsAll, |
| 204 SINGLE_VALUE_TYPE(switches::kDisableThreadedAnimation) | 204 SINGLE_VALUE_TYPE(switches::kEnableAcceleratedAnimation) |
| 205 }, | 205 }, |
| 206 { | 206 { |
| 207 "composited-layer-borders", | 207 "composited-layer-borders", |
| 208 IDS_FLAGS_COMPOSITED_LAYER_BORDERS, | 208 IDS_FLAGS_COMPOSITED_LAYER_BORDERS, |
| 209 IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, | 209 IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, |
| 210 kOsAll, | 210 kOsAll, |
| 211 SINGLE_VALUE_TYPE(switches::kShowCompositedLayerBorders) | 211 SINGLE_VALUE_TYPE(switches::kShowCompositedLayerBorders) |
| 212 }, | 212 }, |
| 213 { | 213 { |
| 214 "show-fps-counter", | 214 "show-fps-counter", |
| (...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1183 } | 1183 } |
| 1184 | 1184 |
| 1185 const Experiment* GetExperiments(size_t* count) { | 1185 const Experiment* GetExperiments(size_t* count) { |
| 1186 *count = num_experiments; | 1186 *count = num_experiments; |
| 1187 return experiments; | 1187 return experiments; |
| 1188 } | 1188 } |
| 1189 | 1189 |
| 1190 } // namespace testing | 1190 } // namespace testing |
| 1191 | 1191 |
| 1192 } // namespace about_flags | 1192 } // namespace about_flags |
| OLD | NEW |