Chromium Code Reviews| 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, | 171 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, |
| 172 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 172 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 173 switches::kOverscrollHistoryNavigation, | 173 switches::kOverscrollHistoryNavigation, |
| 174 "0" }, | 174 "0" }, |
| 175 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, | 175 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, |
| 176 switches::kOverscrollHistoryNavigation, | 176 switches::kOverscrollHistoryNavigation, |
| 177 "2" } | 177 "2" } |
| 178 }; | 178 }; |
| 179 #endif | 179 #endif |
| 180 | 180 |
| 181 const Experiment::Choice kTouchTextSelectionStrategyChoices[] = { | |
| 182 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | |
| 183 { IDS_TOUCH_SELECTION_STRATEGY_CHARACTER, | |
| 184 switches::kTouchTextSelectionStrategy, | |
|
jdduke (slow)
2015/04/21 14:45:08
I can't say I love the use of ordinals to describe
mfomitchev
2015/04/21 15:02:37
These will shown as strings in the about://flags U
jdduke (slow)
2015/04/21 15:13:40
Ah, I didn't realize the names already get pretty
| |
| 185 "0" }, | |
| 186 { IDS_TOUCH_SELECTION_STRATEGY_DIRECTION, | |
| 187 switches::kTouchTextSelectionStrategy, | |
| 188 "1" } | |
| 189 }; | |
| 190 | |
| 181 #if !defined(DISABLE_NACL) | 191 #if !defined(DISABLE_NACL) |
| 182 const Experiment::Choice kNaClDebugMaskChoices[] = { | 192 const Experiment::Choice kNaClDebugMaskChoices[] = { |
| 183 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by | 193 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by |
| 184 // debug stub to a remote machine. Since secure shell uses NaCl, we usually | 194 // debug stub to a remote machine. Since secure shell uses NaCl, we usually |
| 185 // want to avoid debugging that. The PNaCl translator is also a NaCl module, | 195 // want to avoid debugging that. The PNaCl translator is also a NaCl module, |
| 186 // so by default we want to avoid debugging that. | 196 // so by default we want to avoid debugging that. |
| 187 // NOTE: As the default value must be the empty string, the mask excluding | 197 // NOTE: As the default value must be the empty string, the mask excluding |
| 188 // the PNaCl translator and secure shell is substituted elsewhere. | 198 // the PNaCl translator and secure shell is substituted elsewhere. |
| 189 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" }, | 199 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" }, |
| 190 { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" }, | 200 { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" }, |
| (...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1193 }, | 1203 }, |
| 1194 { | 1204 { |
| 1195 "enable-touch-editing", | 1205 "enable-touch-editing", |
| 1196 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1206 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
| 1197 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, | 1207 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, |
| 1198 kOsCrOS | kOsWin | kOsLinux, | 1208 kOsCrOS | kOsWin | kOsLinux, |
| 1199 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, | 1209 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, |
| 1200 switches::kDisableTouchEditing) | 1210 switches::kDisableTouchEditing) |
| 1201 }, | 1211 }, |
| 1202 { | 1212 { |
| 1213 "touch-selection-strategy", | |
|
jdduke (slow)
2015/04/17 17:05:16
"touch-selection-strategy" values of 0/1 don't rea
mfomitchev
2015/04/17 17:14:37
Eventually I'd like to add another strategy: shrin
jdduke (slow)
2015/04/17 19:03:35
Acknowledged.
| |
| 1214 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_NAME, | |
| 1215 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DESCRIPTION, | |
| 1216 kOsAndroid, // TODO(mfomitchev): Add CrOS/Win/Linux support soon. | |
| 1217 MULTI_VALUE_TYPE(kTouchTextSelectionStrategyChoices) | |
| 1218 }, | |
| 1219 { | |
| 1203 "enable-stale-while-revalidate", | 1220 "enable-stale-while-revalidate", |
| 1204 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME, | 1221 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME, |
| 1205 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION, | 1222 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION, |
| 1206 kOsAll, | 1223 kOsAll, |
| 1207 SINGLE_VALUE_TYPE(switches::kEnableStaleWhileRevalidate) | 1224 SINGLE_VALUE_TYPE(switches::kEnableStaleWhileRevalidate) |
| 1208 }, | 1225 }, |
| 1209 { | 1226 { |
| 1210 "enable-suggestions-service", | 1227 "enable-suggestions-service", |
| 1211 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, | 1228 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, |
| 1212 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, | 1229 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, |
| (...skipping 1720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2933 } | 2950 } |
| 2934 | 2951 |
| 2935 const Experiment* GetExperiments(size_t* count) { | 2952 const Experiment* GetExperiments(size_t* count) { |
| 2936 *count = num_experiments; | 2953 *count = num_experiments; |
| 2937 return experiments; | 2954 return experiments; |
| 2938 } | 2955 } |
| 2939 | 2956 |
| 2940 } // namespace testing | 2957 } // namespace testing |
| 2941 | 2958 |
| 2942 } // namespace about_flags | 2959 } // namespace about_flags |
| OLD | NEW |