| 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 <iterator> | 7 #include <iterator> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 first = std::find(cmdline.argv().begin(), cmdline.argv().end(), | 134 first = std::find(cmdline.argv().begin(), cmdline.argv().end(), |
| 135 GetSwitchString(chromeos::switches::kPolicySwitchesBegin)); | 135 GetSwitchString(chromeos::switches::kPolicySwitchesBegin)); |
| 136 last = std::find(cmdline.argv().begin(), cmdline.argv().end(), | 136 last = std::find(cmdline.argv().begin(), cmdline.argv().end(), |
| 137 GetSwitchString(chromeos::switches::kPolicySwitchesEnd)); | 137 GetSwitchString(chromeos::switches::kPolicySwitchesEnd)); |
| 138 if (first != cmdline.argv().end() && last != cmdline.argv().end()) | 138 if (first != cmdline.argv().end() && last != cmdline.argv().end()) |
| 139 flags.insert(first + 1, last); | 139 flags.insert(first + 1, last); |
| 140 #endif | 140 #endif |
| 141 return flags; | 141 return flags; |
| 142 } | 142 } |
| 143 | 143 |
| 144 const Experiment::Choice kEnableCompositingForFixedPositionChoices[] = { | |
| 145 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | |
| 146 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | |
| 147 switches::kEnableCompositingForFixedPosition, ""}, | |
| 148 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | |
| 149 switches::kDisableCompositingForFixedPosition, ""}, | |
| 150 { IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_HIGH_DPI, | |
| 151 switches::kEnableHighDpiCompositingForFixedPosition, ""} | |
| 152 }; | |
| 153 | |
| 154 const Experiment::Choice kEnableCompositingForTransitionChoices[] = { | 144 const Experiment::Choice kEnableCompositingForTransitionChoices[] = { |
| 155 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 145 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 156 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, | 146 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 157 switches::kEnableCompositingForTransition, ""}, | 147 switches::kEnableCompositingForTransition, ""}, |
| 158 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 148 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 159 switches::kDisableCompositingForTransition, ""}, | 149 switches::kDisableCompositingForTransition, ""}, |
| 160 }; | 150 }; |
| 161 | 151 |
| 162 const Experiment::Choice kEnableAcceleratedFixedRootBackgroundChoices[] = { | 152 const Experiment::Choice kEnableAcceleratedFixedRootBackgroundChoices[] = { |
| 163 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 153 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 647 #if defined(OS_ANDROID) | 637 #if defined(OS_ANDROID) |
| 648 { | 638 { |
| 649 "disable-webaudio", | 639 "disable-webaudio", |
| 650 IDS_FLAGS_DISABLE_WEBAUDIO_NAME, | 640 IDS_FLAGS_DISABLE_WEBAUDIO_NAME, |
| 651 IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION, | 641 IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION, |
| 652 kOsAndroid, | 642 kOsAndroid, |
| 653 SINGLE_VALUE_TYPE(switches::kDisableWebAudio) | 643 SINGLE_VALUE_TYPE(switches::kDisableWebAudio) |
| 654 }, | 644 }, |
| 655 #endif | 645 #endif |
| 656 { | 646 { |
| 657 "enable-compositing-for-fixed-position", | |
| 658 IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_NAME, | |
| 659 IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_DESCRIPTION, | |
| 660 kOsAll, | |
| 661 MULTI_VALUE_TYPE(kEnableCompositingForFixedPositionChoices) | |
| 662 }, | |
| 663 { | |
| 664 "enable-compositing-for-transition", | 647 "enable-compositing-for-transition", |
| 665 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_NAME, | 648 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_NAME, |
| 666 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_DESCRIPTION, | 649 IDS_FLAGS_COMPOSITING_FOR_TRANSITION_DESCRIPTION, |
| 667 kOsAll, | 650 kOsAll, |
| 668 MULTI_VALUE_TYPE(kEnableCompositingForTransitionChoices) | 651 MULTI_VALUE_TYPE(kEnableCompositingForTransitionChoices) |
| 669 }, | 652 }, |
| 670 { | 653 { |
| 671 "enable-accelerated-fixed-root-background", | 654 "enable-accelerated-fixed-root-background", |
| 672 IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_NAME, | 655 IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_NAME, |
| 673 IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_DESCRIPTION, | 656 IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_DESCRIPTION, |
| (...skipping 1837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2511 } | 2494 } |
| 2512 | 2495 |
| 2513 const Experiment* GetExperiments(size_t* count) { | 2496 const Experiment* GetExperiments(size_t* count) { |
| 2514 *count = num_experiments; | 2497 *count = num_experiments; |
| 2515 return experiments; | 2498 return experiments; |
| 2516 } | 2499 } |
| 2517 | 2500 |
| 2518 } // namespace testing | 2501 } // namespace testing |
| 2519 | 2502 |
| 2520 } // namespace about_flags | 2503 } // namespace about_flags |
| OLD | NEW |