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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 166 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, | 166 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" }, |
| 167 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, | 167 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, |
| 168 switches::kOverscrollHistoryNavigation, | 168 switches::kOverscrollHistoryNavigation, |
| 169 "0" }, | 169 "0" }, |
| 170 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, | 170 { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI, |
| 171 switches::kOverscrollHistoryNavigation, | 171 switches::kOverscrollHistoryNavigation, |
| 172 "2" } | 172 "2" } |
| 173 }; | 173 }; |
| 174 #endif | 174 #endif |
| 175 | 175 |
| 176 const Experiment::Choice kTouchTextSelectionStrategyChoices[] = { | |
| 177 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, | |
| 178 { IDS_TOUCH_SELECTION_STRATEGY_DIRECTION, | |
| 179 switches::kTouchTextSelectionStrategy, | |
|
jdduke (slow)
2015/04/17 15:20:29
I'd be OK if we just called this |kEnableSmartText
mfomitchev
2015/04/17 16:22:39
You are a bit ahead of me. Check out https://coder
| |
| 180 "1" } | |
| 181 }; | |
| 182 | |
| 176 #if !defined(DISABLE_NACL) | 183 #if !defined(DISABLE_NACL) |
| 177 const Experiment::Choice kNaClDebugMaskChoices[] = { | 184 const Experiment::Choice kNaClDebugMaskChoices[] = { |
| 178 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by | 185 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by |
| 179 // debug stub to a remote machine. Since secure shell uses NaCl, we usually | 186 // debug stub to a remote machine. Since secure shell uses NaCl, we usually |
| 180 // want to avoid debugging that. The PNaCl translator is also a NaCl module, | 187 // want to avoid debugging that. The PNaCl translator is also a NaCl module, |
| 181 // so by default we want to avoid debugging that. | 188 // so by default we want to avoid debugging that. |
| 182 // NOTE: As the default value must be the empty string, the mask excluding | 189 // NOTE: As the default value must be the empty string, the mask excluding |
| 183 // the PNaCl translator and secure shell is substituted elsewhere. | 190 // the PNaCl translator and secure shell is substituted elsewhere. |
| 184 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" }, | 191 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" }, |
| 185 { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" }, | 192 { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" }, |
| (...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1096 }, | 1103 }, |
| 1097 { | 1104 { |
| 1098 "enable-touch-editing", | 1105 "enable-touch-editing", |
| 1099 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1106 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
| 1100 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, | 1107 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, |
| 1101 kOsCrOS | kOsWin | kOsLinux, | 1108 kOsCrOS | kOsWin | kOsLinux, |
| 1102 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, | 1109 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, |
| 1103 switches::kDisableTouchEditing) | 1110 switches::kDisableTouchEditing) |
| 1104 }, | 1111 }, |
| 1105 { | 1112 { |
| 1113 "touch-selection-strategy", | |
| 1114 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_NAME, | |
| 1115 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DESCRIPTION, | |
| 1116 kOsAll, | |
| 1117 MULTI_VALUE_TYPE(kTouchTextSelectionStrategyChoices) | |
| 1118 }, | |
| 1119 { | |
| 1106 "enable-stale-while-revalidate", | 1120 "enable-stale-while-revalidate", |
| 1107 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME, | 1121 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME, |
| 1108 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION, | 1122 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION, |
| 1109 kOsAll, | 1123 kOsAll, |
| 1110 SINGLE_VALUE_TYPE(switches::kEnableStaleWhileRevalidate) | 1124 SINGLE_VALUE_TYPE(switches::kEnableStaleWhileRevalidate) |
| 1111 }, | 1125 }, |
| 1112 { | 1126 { |
| 1113 "enable-suggestions-service", | 1127 "enable-suggestions-service", |
| 1114 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, | 1128 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, |
| 1115 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, | 1129 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION, |
| (...skipping 1665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2781 } | 2795 } |
| 2782 | 2796 |
| 2783 const Experiment* GetExperiments(size_t* count) { | 2797 const Experiment* GetExperiments(size_t* count) { |
| 2784 *count = num_experiments; | 2798 *count = num_experiments; |
| 2785 return experiments; | 2799 return experiments; |
| 2786 } | 2800 } |
| 2787 | 2801 |
| 2788 } // namespace testing | 2802 } // namespace testing |
| 2789 | 2803 |
| 2790 } // namespace about_flags | 2804 } // namespace about_flags |
| OLD | NEW |