Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 903143003: wip: Touch Text Selection Prototypes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@selection_granularity_on_unified
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 #if defined(USE_AURA) || defined(OS_ANDROID)
177 const Experiment::Choice kTouchTextSelectionStrategyChoices[] = {
178 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
179 { IDS_TOUCH_SELECTION_STRATEGY_DIRECTION,
180 switches::kTouchTextSelectionStrategy,
181 "1" },
182 { IDS_TOUCH_SELECTION_STRATEGY_VELOCITY,
183 switches::kTouchTextSelectionStrategy,
184 "2" }
185 };
186 #endif
187
176 #if !defined(DISABLE_NACL) 188 #if !defined(DISABLE_NACL)
177 const Experiment::Choice kNaClDebugMaskChoices[] = { 189 const Experiment::Choice kNaClDebugMaskChoices[] = {
178 // Secure shell can be used on ChromeOS for forwarding the TCP port opened by 190 // 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 191 // 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, 192 // want to avoid debugging that. The PNaCl translator is also a NaCl module,
181 // so by default we want to avoid debugging that. 193 // so by default we want to avoid debugging that.
182 // NOTE: As the default value must be the empty string, the mask excluding 194 // NOTE: As the default value must be the empty string, the mask excluding
183 // the PNaCl translator and secure shell is substituted elsewhere. 195 // the PNaCl translator and secure shell is substituted elsewhere.
184 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" }, 196 { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" },
185 { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" }, 197 { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" },
(...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 switches::kDisableTouchDragDrop) 1118 switches::kDisableTouchDragDrop)
1107 }, 1119 },
1108 { 1120 {
1109 "enable-touch-editing", 1121 "enable-touch-editing",
1110 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, 1122 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME,
1111 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION, 1123 IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION,
1112 kOsCrOS | kOsWin | kOsLinux, 1124 kOsCrOS | kOsWin | kOsLinux,
1113 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing, 1125 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchEditing,
1114 switches::kDisableTouchEditing) 1126 switches::kDisableTouchEditing)
1115 }, 1127 },
1128 #if defined(USE_AURA) || defined(OS_ANDROID)
1129 {
1130 "touch-selection-strategy",
1131 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_NAME,
1132 IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DESCRIPTION,
1133 kOsAll,
1134 MULTI_VALUE_TYPE(kTouchTextSelectionStrategyChoices)
1135 },
1136 #endif
1116 { 1137 {
1117 "enable-stale-while-revalidate", 1138 "enable-stale-while-revalidate",
1118 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME, 1139 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_NAME,
1119 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION, 1140 IDS_FLAGS_ENABLE_STALE_WHILE_REVALIDATE_DESCRIPTION,
1120 kOsAll, 1141 kOsAll,
1121 SINGLE_VALUE_TYPE(switches::kEnableStaleWhileRevalidate) 1142 SINGLE_VALUE_TYPE(switches::kEnableStaleWhileRevalidate)
1122 }, 1143 },
1123 { 1144 {
1124 "enable-suggestions-service", 1145 "enable-suggestions-service",
1125 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME, 1146 IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME,
(...skipping 1603 matching lines...) Expand 10 before | Expand all | Expand 10 after
2729 } 2750 }
2730 2751
2731 const Experiment* GetExperiments(size_t* count) { 2752 const Experiment* GetExperiments(size_t* count) {
2732 *count = num_experiments; 2753 *count = num_experiments;
2733 return experiments; 2754 return experiments;
2734 } 2755 }
2735 2756
2736 } // namespace testing 2757 } // namespace testing
2737 2758
2738 } // namespace about_flags 2759 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698