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 <iterator> | 7 #include <iterator> |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, | 173 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, |
174 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 174 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
175 switches::kOverscrollHistoryNavigation, | 175 switches::kOverscrollHistoryNavigation, |
176 "0" }, | 176 "0" }, |
177 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, | 177 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, |
178 switches::kOverscrollHistoryNavigation, | 178 switches::kOverscrollHistoryNavigation, |
179 "2" } | 179 "2" } |
180 }; | 180 }; |
181 #endif | 181 #endif |
182 | 182 |
| 183 const Experiment::Choice kTouchTextSelectionStrategyChoices[] = { |
| 184 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, |
| 185 { IDS_TOUCH_SELECTION_STRATEGY_CHARACTER, |
| 186 switches::kTouchTextSelectionStrategy, |
| 187 "character" }, |
| 188 { IDS_TOUCH_SELECTION_STRATEGY_DIRECTION, |
| 189 switches::kTouchTextSelectionStrategy, |
| 190 "direction" } |
| 191 }; |
| 192 |
183 #if !defined(DISABLE_NACL) | 193 #if !defined(DISABLE_NACL) |
184 const Experiment::Choice kNaClDebugMaskChoices[] = { | 194 const Experiment::Choice kNaClDebugMaskChoices[] = { |
185 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by | 195 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by |
186 // debug stub to a remote machine. Since secure shell uses NaCl, we usually | 196 // debug stub to a remote machine. Since secure shell uses NaCl, we usually |
187 // want to avoid debugging that. The PNaCl translator is also a NaCl module, | 197 // want to avoid debugging that. The PNaCl translator is also a NaCl module, |
188 // so by default we want to avoid debugging that. | 198 // so by default we want to avoid debugging that. |
189 // NOTE: As the default value must be the empty string, the mask excluding | 199 // NOTE: As the default value must be the empty string, the mask excluding |
190 // the PNaCl translator and secure shell is substituted elsewhere. | 200 // the PNaCl translator and secure shell is substituted elsewhere. |
191 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" }, | 201 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" }, |
192 { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" }, | 202 { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" }, |
(...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1212 }, | 1222 }, |
1213 { | 1223 { |
1214 "enable-touch-editing", | 1224 "enable-touch-editing", |
1215 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1225 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
1216 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, | 1226 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, |
1217 kOsCrOS | kOsWin | kOsLinux, | 1227 kOsCrOS | kOsWin | kOsLinux, |
1218 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, | 1228 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, |
1219 switches::kDisableTouchEditing) | 1229 switches::kDisableTouchEditing) |
1220 }, | 1230 }, |
1221 { | 1231 { |
| 1232 "touch-selection-strategy", |
| 1233 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_NAME, |
| 1234 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DESCRIPTION, |
| 1235 kOsAndroid, // TODO(mfomitchev): Add CrOS/Win/Linux support soon. |
| 1236 MULTI_VALUE_TYPE(kTouchTextSelectionStrategyChoices) |
| 1237 }, |
| 1238 { |
1222 "enable-stale-while-revalidate", | 1239 "enable-stale-while-revalidate", |
1223 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME, | 1240 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME, |
1224 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION, | 1241 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION, |
1225 kOsAll, | 1242 kOsAll, |
1226 SINGLE_VALUE_TYPE(switches::kEnableStaleWhileRevalidate) | 1243 SINGLE_VALUE_TYPE(switches::kEnableStaleWhileRevalidate) |
1227 }, | 1244 }, |
1228 { | 1245 { |
1229 "enable-suggestions-service", | 1246 "enable-suggestions-service", |
1230 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, | 1247 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, |
1231 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, | 1248 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, |
(...skipping 1728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2960 } | 2977 } |
2961 | 2978 |
2962 const Experiment* GetExperiments(size_t* count) { | 2979 const Experiment* GetExperiments(size_t* count) { |
2963 *count = num_experiments; | 2980 *count = num_experiments; |
2964 return experiments; | 2981 return experiments; |
2965 } | 2982 } |
2966 | 2983 |
2967 } // namespace testing | 2984 } // namespace testing |
2968 | 2985 |
2969 } // namespace about_flags | 2986 } // namespace about_flags |
OLD | NEW |