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 849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
860 kOsCrOS, | 860 kOsCrOS, |
861 SINGLE_VALUE_TYPE(ash::switches::kAshDisableBootAnimation2), | 861 SINGLE_VALUE_TYPE(ash::switches::kAshDisableBootAnimation2), |
862 }, | 862 }, |
863 { | 863 { |
864 "boot-animation-fucntion", | 864 "boot-animation-fucntion", |
865 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION, | 865 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION, |
866 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION, | 866 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION, |
867 kOsCrOS, | 867 kOsCrOS, |
868 MULTI_VALUE_TYPE(kAshBootAnimationFunction), | 868 MULTI_VALUE_TYPE(kAshBootAnimationFunction), |
869 }, | 869 }, |
| 870 { |
| 871 "new-lock-animations", |
| 872 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS, |
| 873 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_DESCRIPTION, |
| 874 kOsCrOS, |
| 875 SINGLE_VALUE_TYPE(ash::switches::kAshNewLockAnimationsEnabled), |
| 876 }, |
870 #endif | 877 #endif |
871 { | 878 { |
872 "enable-views-textfield", | 879 "enable-views-textfield", |
873 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_NAME, | 880 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_NAME, |
874 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_DESCRIPTION, | 881 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_DESCRIPTION, |
875 kOsWin, | 882 kOsWin, |
876 SINGLE_VALUE_TYPE(switches::kEnableViewsTextfield), | 883 SINGLE_VALUE_TYPE(switches::kEnableViewsTextfield), |
877 }, | 884 }, |
878 { | 885 { |
879 "old-checkbox-style", | 886 "old-checkbox-style", |
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1399 } | 1406 } |
1400 | 1407 |
1401 const Experiment* GetExperiments(size_t* count) { | 1408 const Experiment* GetExperiments(size_t* count) { |
1402 *count = num_experiments; | 1409 *count = num_experiments; |
1403 return experiments; | 1410 return experiments; |
1404 } | 1411 } |
1405 | 1412 |
1406 } // namespace testing | 1413 } // namespace testing |
1407 | 1414 |
1408 } // namespace about_flags | 1415 } // namespace about_flags |
OLD | NEW |