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 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1155 { | 1155 { |
1156 "scroll-end-effect", | 1156 "scroll-end-effect", |
1157 IDS_FLAGS_SCROLL_END_EFFECT_NAME, | 1157 IDS_FLAGS_SCROLL_END_EFFECT_NAME, |
1158 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, | 1158 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, |
1159 kOsCrOS, | 1159 kOsCrOS, |
1160 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( | 1160 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
1161 switches::kScrollEndEffect, "1", | 1161 switches::kScrollEndEffect, "1", |
1162 switches::kScrollEndEffect, "0") | 1162 switches::kScrollEndEffect, "0") |
1163 }, | 1163 }, |
1164 { | 1164 { |
| 1165 "enable-renderer-mojo-channel", |
| 1166 IDS_FLAGS_ENABLE_RENDERER_MOJO_CHANNEL_NAME, |
| 1167 IDS_FLAGS_ENABLE_RENDERER_MOJO_CHANNEL_DESCRIPTION, |
| 1168 kOsAll, |
| 1169 SINGLE_VALUE_TYPE(switches::kEnableRendererMojoChannel) |
| 1170 }, |
| 1171 { |
1165 "enable-touch-drag-drop", | 1172 "enable-touch-drag-drop", |
1166 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, | 1173 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, |
1167 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, | 1174 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, |
1168 kOsWin | kOsCrOS, | 1175 kOsWin | kOsCrOS, |
1169 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, | 1176 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, |
1170 switches::kDisableTouchDragDrop) | 1177 switches::kDisableTouchDragDrop) |
1171 }, | 1178 }, |
1172 { | 1179 { |
1173 "enable-touch-editing", | 1180 "enable-touch-editing", |
1174 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1181 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2438 } | 2445 } |
2439 | 2446 |
2440 const Experiment* GetExperiments(size_t* count) { | 2447 const Experiment* GetExperiments(size_t* count) { |
2441 *count = num_experiments; | 2448 *count = num_experiments; |
2442 return experiments; | 2449 return experiments; |
2443 } | 2450 } |
2444 | 2451 |
2445 } // namespace testing | 2452 } // namespace testing |
2446 | 2453 |
2447 } // namespace about_flags | 2454 } // namespace about_flags |
OLD | NEW |