| 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 kOsWin, | 104 kOsWin, |
| 105 switches::kEnableCloudPrintProxy | 105 switches::kEnableCloudPrintProxy |
| 106 }, | 106 }, |
| 107 { | 107 { |
| 108 "match-preview", // Do not change; see above. | 108 "match-preview", // Do not change; see above. |
| 109 IDS_FLAGS_PREDICTIVE_INSTANT_NAME, | 109 IDS_FLAGS_PREDICTIVE_INSTANT_NAME, |
| 110 IDS_FLAGS_PREDICTIVE_INSTANT_DESCRIPTION, | 110 IDS_FLAGS_PREDICTIVE_INSTANT_DESCRIPTION, |
| 111 kOsMac, | 111 kOsMac, |
| 112 switches::kEnablePredictiveInstant | 112 switches::kEnablePredictiveInstant |
| 113 }, | 113 }, |
| 114 { | |
| 115 "verbatim-instant", // Do not change; see above. | |
| 116 IDS_FLAGS_VERBATIM_INSTANT_NAME, | |
| 117 IDS_FLAGS_VERBATIM_INSTANT_DESCRIPTION, | |
| 118 kOsMac | kOsLinux | kOsWin, | |
| 119 switches::kEnableVerbatimInstant | |
| 120 }, | |
| 121 // FIXME(scheib): Add Flags entry for accelerated Compositing, | 114 // FIXME(scheib): Add Flags entry for accelerated Compositing, |
| 122 // or pull it and the strings in generated_resources.grd by Dec 2010 | 115 // or pull it and the strings in generated_resources.grd by Dec 2010 |
| 123 // { | 116 // { |
| 124 // "gpu-compositing", // Do not change; see above | 117 // "gpu-compositing", // Do not change; see above |
| 125 // IDS_FLAGS_ACCELERATED_COMPOSITING_NAME, | 118 // IDS_FLAGS_ACCELERATED_COMPOSITING_NAME, |
| 126 // IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION, | 119 // IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION, |
| 127 // kOsAll, | 120 // kOsAll, |
| 128 // switches::kDisableAcceleratedCompositing | 121 // switches::kDisableAcceleratedCompositing |
| 129 // }, | 122 // }, |
| 130 { | 123 { |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 num_experiments = arraysize(kExperiments); | 451 num_experiments = arraysize(kExperiments); |
| 459 } else { | 452 } else { |
| 460 experiments = e; | 453 experiments = e; |
| 461 num_experiments = count; | 454 num_experiments = count; |
| 462 } | 455 } |
| 463 } | 456 } |
| 464 | 457 |
| 465 } // namespace testing | 458 } // namespace testing |
| 466 | 459 |
| 467 } // namespace about_flags | 460 } // namespace about_flags |
| OLD | NEW |