| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 }; | 119 }; |
| 120 | 120 |
| 121 const Experiment::Choice kEnableCompositingForTransitionChoices[] = { | 121 const Experiment::Choice kEnableCompositingForTransitionChoices[] = { |
| 122 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 122 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 123 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 123 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 124 switches::kEnableCompositingForTransition, ""}, | 124 switches::kEnableCompositingForTransition, ""}, |
| 125 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 125 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 126 switches::kDisableCompositingForTransition, ""}, | 126 switches::kDisableCompositingForTransition, ""}, |
| 127 }; | 127 }; |
| 128 | 128 |
| 129 const Experiment::Choice kEnableAcceleratedFixedRootBackgroundChoices[] = { |
| 130 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 131 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 132 switches::kEnableAcceleratedFixedRootBackground, ""}, |
| 133 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 134 switches::kDisableAcceleratedFixedRootBackground, ""}, |
| 135 }; |
| 136 |
| 129 const Experiment::Choice kGDIPresentChoices[] = { | 137 const Experiment::Choice kGDIPresentChoices[] = { |
| 130 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 138 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 131 { IDS_FLAGS_PRESENT_WITH_GDI_FIRST_SHOW, | 139 { IDS_FLAGS_PRESENT_WITH_GDI_FIRST_SHOW, |
| 132 switches::kDoFirstShowPresentWithGDI, ""}, | 140 switches::kDoFirstShowPresentWithGDI, ""}, |
| 133 { IDS_FLAGS_PRESENT_WITH_GDI_ALL_SHOW, | 141 { IDS_FLAGS_PRESENT_WITH_GDI_ALL_SHOW, |
| 134 switches::kDoAllShowPresentWithGDI, ""} | 142 switches::kDoAllShowPresentWithGDI, ""} |
| 135 }; | 143 }; |
| 136 | 144 |
| 137 const Experiment::Choice kTouchEventsChoices[] = { | 145 const Experiment::Choice kTouchEventsChoices[] = { |
| 138 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, | 146 { IDS_GENERIC_EXPERIMENT_CHOICE_AUTOMATIC, "", "" }, |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 kOsAll, | 465 kOsAll, |
| 458 MULTI_VALUE_TYPE(kEnableCompositingForFixedPositionChoices) | 466 MULTI_VALUE_TYPE(kEnableCompositingForFixedPositionChoices) |
| 459 }, | 467 }, |
| 460 { | 468 { |
| 461 "enable-compositing-for-transition", | 469 "enable-compositing-for-transition", |
| 462 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_NAME, | 470 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_NAME, |
| 463 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_DESCRIPTION, | 471 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_DESCRIPTION, |
| 464 kOsAll, | 472 kOsAll, |
| 465 MULTI_VALUE_TYPE(kEnableCompositingForTransitionChoices) | 473 MULTI_VALUE_TYPE(kEnableCompositingForTransitionChoices) |
| 466 }, | 474 }, |
| 475 { |
| 476 "enable-accelerated-fixed-root-background", |
| 477 IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_NAME, |
| 478 IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_DESCRIPTION, |
| 479 kOsAll, |
| 480 MULTI_VALUE_TYPE(kEnableAcceleratedFixedRootBackgroundChoices) |
| 481 }, |
| 467 // TODO(bbudge): When NaCl is on by default, remove this flag entry. | 482 // TODO(bbudge): When NaCl is on by default, remove this flag entry. |
| 468 { | 483 { |
| 469 "enable-nacl", // FLAGS:RECORD_UMA | 484 "enable-nacl", // FLAGS:RECORD_UMA |
| 470 IDS_FLAGS_ENABLE_NACL_NAME, | 485 IDS_FLAGS_ENABLE_NACL_NAME, |
| 471 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, | 486 IDS_FLAGS_ENABLE_NACL_DESCRIPTION, |
| 472 kOsDesktop, | 487 kOsDesktop, |
| 473 SINGLE_VALUE_TYPE(switches::kEnableNaCl) | 488 SINGLE_VALUE_TYPE(switches::kEnableNaCl) |
| 474 }, | 489 }, |
| 475 { | 490 { |
| 476 "enable-nacl-debug", // FLAGS:RECORD_UMA | 491 "enable-nacl-debug", // FLAGS:RECORD_UMA |
| (...skipping 1543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2020 } | 2035 } |
| 2021 | 2036 |
| 2022 const Experiment* GetExperiments(size_t* count) { | 2037 const Experiment* GetExperiments(size_t* count) { |
| 2023 *count = num_experiments; | 2038 *count = num_experiments; |
| 2024 return experiments; | 2039 return experiments; |
| 2025 } | 2040 } |
| 2026 | 2041 |
| 2027 } // namespace testing | 2042 } // namespace testing |
| 2028 | 2043 |
| 2029 } // namespace about_flags | 2044 } // namespace about_flags |
| OLD | NEW |