| 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 kOsWin, | 121 kOsWin, |
| 122 switches::kEnableCloudPrintProxy | 122 switches::kEnableCloudPrintProxy |
| 123 }, | 123 }, |
| 124 { | 124 { |
| 125 "match-preview", // Do not change; see above. | 125 "match-preview", // Do not change; see above. |
| 126 IDS_FLAGS_INSTANT_NAME, | 126 IDS_FLAGS_INSTANT_NAME, |
| 127 IDS_FLAGS_INSTANT_DESCRIPTION, | 127 IDS_FLAGS_INSTANT_DESCRIPTION, |
| 128 kOsMac, | 128 kOsMac, |
| 129 switches::kEnableMatchPreview | 129 switches::kEnableMatchPreview |
| 130 }, | 130 }, |
| 131 // FIXME(scheib): Add Flags entry for accelerated Compositing, | 131 { |
| 132 // or pull it and the strings in generated_resources.grd by Dec 2010 | 132 "gpu-compositing", // Do not change; see above |
| 133 // { | 133 IDS_FLAGS_ACCELERATED_COMPOSITING_NAME, |
| 134 // "gpu-compositing", // Do not change; see above | 134 IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION, |
| 135 // IDS_FLAGS_ACCELERATED_COMPOSITING_NAME, | 135 kOsAll, |
| 136 // IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION, | 136 switches::kEnableAcceleratedCompositing |
| 137 // kOsAll, | 137 }, |
| 138 // switches::kDisableAcceleratedCompositing | |
| 139 // }, | |
| 140 { | 138 { |
| 141 "gpu-canvas-2d", // Do not change; see above | 139 "gpu-canvas-2d", // Do not change; see above |
| 142 IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME, | 140 IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME, |
| 143 IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION, | 141 IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION, |
| 144 kOsWin | kOsLinux | kOsCrOS, | 142 kOsWin | kOsLinux | kOsCrOS, |
| 145 switches::kEnableAccelerated2dCanvas | 143 switches::kEnableAccelerated2dCanvas |
| 146 }, | 144 }, |
| 147 // FIXME(scheib): Add Flags entry for WebGL, | 145 { |
| 148 // or pull it and the strings in generated_resources.grd by Dec 2010 | 146 "webgl", // Do not change; see above |
| 149 // { | 147 IDS_FLAGS_WEBGL_NAME, |
| 150 // "webgl", // Do not change; see above | 148 IDS_FLAGS_WEBGL_DESCRIPTION, |
| 151 // IDS_FLAGS_WEBGL_NAME, | 149 kOsAll, |
| 152 // IDS_FLAGS_WEBGL_DESCRIPTION, | 150 switches::kEnableExperimentalWebGL |
| 153 // kOsAll, | 151 }, |
| 154 // switches::kDisableExperimentalWebGL | |
| 155 // } | |
| 156 { | 152 { |
| 157 "print-preview", // Do not change; see above | 153 "print-preview", // Do not change; see above |
| 158 IDS_FLAGS_PRINT_PREVIEW_NAME, | 154 IDS_FLAGS_PRINT_PREVIEW_NAME, |
| 159 IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION, | 155 IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION, |
| 160 kOsAll, | 156 kOsAll, |
| 161 switches::kEnablePrintPreview | 157 switches::kEnablePrintPreview |
| 162 }, | 158 }, |
| 163 { | 159 { |
| 164 "dns-server", | 160 "dns-server", |
| 165 IDS_FLAGS_DNS_SERVER_NAME, | 161 IDS_FLAGS_DNS_SERVER_NAME, |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 | 390 |
| 395 } // namespace | 391 } // namespace |
| 396 | 392 |
| 397 namespace testing { | 393 namespace testing { |
| 398 void ClearState() { | 394 void ClearState() { |
| 399 FlagsState::instance()->reset(); | 395 FlagsState::instance()->reset(); |
| 400 } | 396 } |
| 401 } // namespace testing | 397 } // namespace testing |
| 402 | 398 |
| 403 } // namespace about_flags | 399 } // namespace about_flags |
| OLD | NEW |