| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 }; | 178 }; |
| 179 | 179 |
| 180 #if defined(OS_CHROMEOS) | 180 #if defined(OS_CHROMEOS) |
| 181 const Experiment::Choice kAshBootAnimationFunction[] = { | 181 const Experiment::Choice kAshBootAnimationFunction[] = { |
| 182 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 182 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 183 { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION2, | 183 { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION2, |
| 184 ash::switches::kAshBootAnimationFunction2, ""}, | 184 ash::switches::kAshBootAnimationFunction2, ""}, |
| 185 { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION3, | 185 { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION3, |
| 186 ash::switches::kAshBootAnimationFunction3, ""} | 186 ash::switches::kAshBootAnimationFunction3, ""} |
| 187 }; | 187 }; |
| 188 |
| 189 const Experiment::Choice kAshLockAnimationChoices[] = { |
| 190 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 191 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 192 ash::switches::kAshNewLockAnimationsDisabled, "0"}, |
| 193 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, |
| 194 ash::switches::kAshNewLockAnimationsEnabled, "1"} |
| 195 }; |
| 196 |
| 197 |
| 188 #endif | 198 #endif |
| 189 | 199 |
| 190 | 200 |
| 191 // RECORDING USER METRICS FOR FLAGS: | 201 // RECORDING USER METRICS FOR FLAGS: |
| 192 // ----------------------------------------------------------------------------- | 202 // ----------------------------------------------------------------------------- |
| 193 // The first line of the experiment is the internal name. If you'd like to | 203 // The first line of the experiment is the internal name. If you'd like to |
| 194 // gather statistics about the usage of your flag, you should append a marker | 204 // gather statistics about the usage of your flag, you should append a marker |
| 195 // comment to the end of the feature name, like so: | 205 // comment to the end of the feature name, like so: |
| 196 // "my-special-feature", // FLAGS:RECORD_UMA | 206 // "my-special-feature", // FLAGS:RECORD_UMA |
| 197 // | 207 // |
| (...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 860 kOsCrOS, | 870 kOsCrOS, |
| 861 SINGLE_VALUE_TYPE(ash::switches::kAshDisableBootAnimation2), | 871 SINGLE_VALUE_TYPE(ash::switches::kAshDisableBootAnimation2), |
| 862 }, | 872 }, |
| 863 { | 873 { |
| 864 "boot-animation-fucntion", | 874 "boot-animation-fucntion", |
| 865 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION, | 875 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION, |
| 866 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION, | 876 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION, |
| 867 kOsCrOS, | 877 kOsCrOS, |
| 868 MULTI_VALUE_TYPE(kAshBootAnimationFunction), | 878 MULTI_VALUE_TYPE(kAshBootAnimationFunction), |
| 869 }, | 879 }, |
| 880 { |
| 881 "new-lock-animations", |
| 882 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS, |
| 883 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_DESCRIPTION, |
| 884 kOsCrOS, |
| 885 MULTI_VALUE_TYPE(kAshLockAnimationChoices), |
| 886 }, |
| 870 #endif | 887 #endif |
| 871 { | 888 { |
| 872 "enable-views-textfield", | 889 "enable-views-textfield", |
| 873 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_NAME, | 890 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_NAME, |
| 874 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_DESCRIPTION, | 891 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_DESCRIPTION, |
| 875 kOsWin, | 892 kOsWin, |
| 876 SINGLE_VALUE_TYPE(switches::kEnableViewsTextfield), | 893 SINGLE_VALUE_TYPE(switches::kEnableViewsTextfield), |
| 877 }, | 894 }, |
| 878 { | 895 { |
| 879 "old-checkbox-style", | 896 "old-checkbox-style", |
| (...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1399 } | 1416 } |
| 1400 | 1417 |
| 1401 const Experiment* GetExperiments(size_t* count) { | 1418 const Experiment* GetExperiments(size_t* count) { |
| 1402 *count = num_experiments; | 1419 *count = num_experiments; |
| 1403 return experiments; | 1420 return experiments; |
| 1404 } | 1421 } |
| 1405 | 1422 |
| 1406 } // namespace testing | 1423 } // namespace testing |
| 1407 | 1424 |
| 1408 } // namespace about_flags | 1425 } // namespace about_flags |
| OLD | NEW |