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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by | 159 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by |
160 // debug stub to a remote machine. Since secure shell uses NaCl, we provide | 160 // debug stub to a remote machine. Since secure shell uses NaCl, we provide |
161 // an option to switch off its debugging. | 161 // an option to switch off its debugging. |
162 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS, | 162 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS, |
163 switches::kNaClDebugMask, "!*://*/*ssh_client.nmf" }, | 163 switches::kNaClDebugMask, "!*://*/*ssh_client.nmf" }, |
164 { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, | 164 { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, |
165 switches::kNaClDebugMask, "*://*/*debug.nmf" } | 165 switches::kNaClDebugMask, "*://*/*debug.nmf" } |
166 }; | 166 }; |
167 | 167 |
168 #if defined(OS_CHROMEOS) | 168 #if defined(OS_CHROMEOS) |
169 const Experiment::Choice kAshBootAnimationFunction[] = { | |
170 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | |
171 { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION2, | |
172 ash::switches::kAshBootAnimationFunction2, ""}, | |
173 { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION3, | |
174 ash::switches::kAshBootAnimationFunction3, ""} | |
175 }; | |
176 | 169 |
177 const Experiment::Choice kChromeCaptivePortalDetectionChoices[] = { | 170 const Experiment::Choice kChromeCaptivePortalDetectionChoices[] = { |
178 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | 171 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
179 { IDS_FLAGS_CHROME_CAPTIVE_PORTAL_DETECTOR, | 172 { IDS_FLAGS_CHROME_CAPTIVE_PORTAL_DETECTOR, |
180 chromeos::switches::kEnableChromeCaptivePortalDetector, "" }, | 173 chromeos::switches::kEnableChromeCaptivePortalDetector, "" }, |
181 { IDS_FLAGS_SHILL_CAPTIVE_PORTAL_DETECTOR, | 174 { IDS_FLAGS_SHILL_CAPTIVE_PORTAL_DETECTOR, |
182 chromeos::switches::kDisableChromeCaptivePortalDetector, "" } | 175 chromeos::switches::kDisableChromeCaptivePortalDetector, "" } |
183 }; | 176 }; |
184 | 177 |
185 #endif | 178 #endif |
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1032 #endif // defined(USE_ASH) | 1025 #endif // defined(USE_ASH) |
1033 #if defined(OS_CHROMEOS) | 1026 #if defined(OS_CHROMEOS) |
1034 { | 1027 { |
1035 "disable-boot-animation", | 1028 "disable-boot-animation", |
1036 IDS_FLAGS_DISABLE_BOOT_ANIMATION, | 1029 IDS_FLAGS_DISABLE_BOOT_ANIMATION, |
1037 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, | 1030 IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION, |
1038 kOsCrOSOwnerOnly, | 1031 kOsCrOSOwnerOnly, |
1039 SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), | 1032 SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation), |
1040 }, | 1033 }, |
1041 { | 1034 { |
1042 "disable-boot-animation2", | |
1043 IDS_FLAGS_DISABLE_BOOT_ANIMATION2, | |
1044 IDS_FLAGS_DISABLE_BOOT_ANIMATION2_DESCRIPTION, | |
1045 kOsCrOSOwnerOnly, | |
1046 SINGLE_VALUE_TYPE(ash::switches::kAshDisableBootAnimation2), | |
1047 }, | |
1048 { | |
1049 "boot-animation-fucntion", | |
1050 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION, | |
1051 IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION, | |
1052 kOsCrOSOwnerOnly, | |
1053 MULTI_VALUE_TYPE(kAshBootAnimationFunction), | |
1054 }, | |
1055 { | |
1056 "captive-portal-detector", | 1035 "captive-portal-detector", |
1057 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_NAME, | 1036 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_NAME, |
1058 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_DESCRIPTION, | 1037 IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_DESCRIPTION, |
1059 kOsCrOSOwnerOnly, | 1038 kOsCrOSOwnerOnly, |
1060 MULTI_VALUE_TYPE(kChromeCaptivePortalDetectionChoices), | 1039 MULTI_VALUE_TYPE(kChromeCaptivePortalDetectionChoices), |
1061 }, | 1040 }, |
1062 { | 1041 { |
1063 "disable-new-lock-animations", | 1042 "disable-new-lock-animations", |
1064 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS, | 1043 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS, |
1065 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_DESCRIPTION, | 1044 IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_DESCRIPTION, |
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1972 } | 1951 } |
1973 | 1952 |
1974 const Experiment* GetExperiments(size_t* count) { | 1953 const Experiment* GetExperiments(size_t* count) { |
1975 *count = num_experiments; | 1954 *count = num_experiments; |
1976 return experiments; | 1955 return experiments; |
1977 } | 1956 } |
1978 | 1957 |
1979 } // namespace testing | 1958 } // namespace testing |
1980 | 1959 |
1981 } // namespace about_flags | 1960 } // namespace about_flags |
OLD | NEW |