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 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
739 SINGLE_VALUE_TYPE(ash::switches::kAshNotify), | 739 SINGLE_VALUE_TYPE(ash::switches::kAshNotify), |
740 }, | 740 }, |
741 { | 741 { |
742 "enable-pinch", | 742 "enable-pinch", |
743 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, | 743 IDS_FLAGS_ENABLE_PINCH_SCALE_NAME, |
744 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, | 744 IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION, |
745 kOsAll, | 745 kOsAll, |
746 SINGLE_VALUE_TYPE(switches::kEnablePinch), | 746 SINGLE_VALUE_TYPE(switches::kEnablePinch), |
747 }, | 747 }, |
748 #endif // defined(USE_ASH) | 748 #endif // defined(USE_ASH) |
| 749 #if defined(OS_CHROMEOS) |
| 750 { |
| 751 "enable-new-oobe", |
| 752 IDS_FLAGS_ENABLE_NEW_OOBE, |
| 753 IDS_FLAGS_ENABLE_NEW_OOBE_DESCRIPTION, |
| 754 kOsCrOS, |
| 755 SINGLE_VALUE_TYPE(switches::kEnableNewOobe), |
| 756 }, |
| 757 #endif |
749 }; | 758 }; |
750 | 759 |
751 const Experiment* experiments = kExperiments; | 760 const Experiment* experiments = kExperiments; |
752 size_t num_experiments = arraysize(kExperiments); | 761 size_t num_experiments = arraysize(kExperiments); |
753 | 762 |
754 // Stores and encapsulates the little state that about:flags has. | 763 // Stores and encapsulates the little state that about:flags has. |
755 class FlagsState { | 764 class FlagsState { |
756 public: | 765 public: |
757 FlagsState() : needs_restart_(false) {} | 766 FlagsState() : needs_restart_(false) {} |
758 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); | 767 void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line); |
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1174 } | 1183 } |
1175 | 1184 |
1176 const Experiment* GetExperiments(size_t* count) { | 1185 const Experiment* GetExperiments(size_t* count) { |
1177 *count = num_experiments; | 1186 *count = num_experiments; |
1178 return experiments; | 1187 return experiments; |
1179 } | 1188 } |
1180 | 1189 |
1181 } // namespace testing | 1190 } // namespace testing |
1182 | 1191 |
1183 } // namespace about_flags | 1192 } // namespace about_flags |
OLD | NEW |