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 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
845 kOsCrOS, | 845 kOsCrOS, |
846 SINGLE_VALUE_TYPE(switches::kDisableNewOobe), | 846 SINGLE_VALUE_TYPE(switches::kDisableNewOobe), |
847 }, | 847 }, |
848 { | 848 { |
849 "disable-boot-animation", | 849 "disable-boot-animation", |
850 IDS_FLAGS_DISABLE_BOOT_ANIMATION, | 850 IDS_FLAGS_DISABLE_BOOT_ANIMATION, |
851 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, | 851 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, |
852 kOsCrOS, | 852 kOsCrOS, |
853 SINGLE_VALUE_TYPE(switches::kDisableBootAnimation), | 853 SINGLE_VALUE_TYPE(switches::kDisableBootAnimation), |
854 }, | 854 }, |
| 855 { |
| 856 "enable-workspace2", |
| 857 IDS_FLAGS_ENABLE_WORKSPACE2, |
| 858 IDS_FLAGS_ENABLE_WORKSPACE2_DESCRIPTION, |
| 859 kOsCrOS, |
| 860 SINGLE_VALUE_TYPE(ash::switches::kAshEnableWorkspace2), |
| 861 }, |
855 #endif | 862 #endif |
856 { | 863 { |
857 "enable-views-textfield", | 864 "enable-views-textfield", |
858 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_NAME, | 865 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_NAME, |
859 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_DESCRIPTION, | 866 IDS_FLAGS_ENABLE_VIEWS_TEXTFIELD_DESCRIPTION, |
860 kOsWin, | 867 kOsWin, |
861 SINGLE_VALUE_TYPE(switches::kEnableViewsTextfield), | 868 SINGLE_VALUE_TYPE(switches::kEnableViewsTextfield), |
862 }, | 869 }, |
863 { | 870 { |
864 "old-checkbox-style", | 871 "old-checkbox-style", |
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1341 } | 1348 } |
1342 | 1349 |
1343 const Experiment* GetExperiments(size_t* count) { | 1350 const Experiment* GetExperiments(size_t* count) { |
1344 *count = num_experiments; | 1351 *count = num_experiments; |
1345 return experiments; | 1352 return experiments; |
1346 } | 1353 } |
1347 | 1354 |
1348 } // namespace testing | 1355 } // namespace testing |
1349 | 1356 |
1350 } // namespace about_flags | 1357 } // namespace about_flags |
OLD | NEW |