| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 switches::kEnableMatchPreview | 136 switches::kEnableMatchPreview |
| 137 }, | 137 }, |
| 138 { | 138 { |
| 139 "gpu-compositing", // Do not change; see above | 139 "gpu-compositing", // Do not change; see above |
| 140 IDS_FLAGS_ACCELERATED_COMPOSITING_NAME, | 140 IDS_FLAGS_ACCELERATED_COMPOSITING_NAME, |
| 141 IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION, | 141 IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION, |
| 142 kOsAll, | 142 kOsAll, |
| 143 switches::kEnableAcceleratedCompositing | 143 switches::kEnableAcceleratedCompositing |
| 144 }, | 144 }, |
| 145 { | 145 { |
| 146 "gpu-canvas-2d", // Do not change; see above | |
| 147 IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME, | |
| 148 IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION, | |
| 149 kOsWin | kOsLinux | kOsCrOS, | |
| 150 switches::kEnableAccelerated2dCanvas | |
| 151 }, | |
| 152 { | |
| 153 "webgl", // Do not change; see above | 146 "webgl", // Do not change; see above |
| 154 IDS_FLAGS_WEBGL_NAME, | 147 IDS_FLAGS_WEBGL_NAME, |
| 155 IDS_FLAGS_WEBGL_DESCRIPTION, | 148 IDS_FLAGS_WEBGL_DESCRIPTION, |
| 156 kOsAll, | 149 kOsAll, |
| 157 switches::kEnableExperimentalWebGL | 150 switches::kEnableExperimentalWebGL |
| 158 } | 151 } |
| 159 //{ | 152 //{ |
| 160 // "print-preview", // Do not change; see above | 153 // "print-preview", // Do not change; see above |
| 161 // IDS_FLAGS_PRINT_PREVIEW_NAME, | 154 // IDS_FLAGS_PRINT_PREVIEW_NAME, |
| 162 // IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION, | 155 // IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION, |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 | 376 |
| 384 } // namespace | 377 } // namespace |
| 385 | 378 |
| 386 namespace testing { | 379 namespace testing { |
| 387 void ClearState() { | 380 void ClearState() { |
| 388 FlagsState::instance()->reset(); | 381 FlagsState::instance()->reset(); |
| 389 } | 382 } |
| 390 } // namespace testing | 383 } // namespace testing |
| 391 | 384 |
| 392 } // namespace about_flags | 385 } // namespace about_flags |
| OLD | NEW |