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 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1116 { | 1116 { |
1117 "scroll-end-effect", | 1117 "scroll-end-effect", |
1118 IDS_FLAGS_SCROLL_END_EFFECT_NAME, | 1118 IDS_FLAGS_SCROLL_END_EFFECT_NAME, |
1119 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, | 1119 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, |
1120 kOsCrOS, | 1120 kOsCrOS, |
1121 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( | 1121 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
1122 switches::kScrollEndEffect, "1", | 1122 switches::kScrollEndEffect, "1", |
1123 switches::kScrollEndEffect, "0") | 1123 switches::kScrollEndEffect, "0") |
1124 }, | 1124 }, |
1125 { | 1125 { |
| 1126 "enable-icon-ntp", |
| 1127 IDS_FLAGS_ENABLE_ICON_NTP_NAME, |
| 1128 IDS_FLAGS_ENABLE_ICON_NTP_DESCRIPTION, |
| 1129 kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS, |
| 1130 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableIconNtp, |
| 1131 switches::kDisableIconNtp) |
| 1132 }, |
| 1133 { |
1126 "enable-touch-drag-drop", | 1134 "enable-touch-drag-drop", |
1127 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, | 1135 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, |
1128 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, | 1136 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, |
1129 kOsWin | kOsCrOS, | 1137 kOsWin | kOsCrOS, |
1130 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, | 1138 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, |
1131 switches::kDisableTouchDragDrop) | 1139 switches::kDisableTouchDragDrop) |
1132 }, | 1140 }, |
1133 { | 1141 { |
1134 "enable-touch-editing", | 1142 "enable-touch-editing", |
1135 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1143 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
(...skipping 1723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2859 } | 2867 } |
2860 | 2868 |
2861 const Experiment* GetExperiments(size_t* count) { | 2869 const Experiment* GetExperiments(size_t* count) { |
2862 *count = num_experiments; | 2870 *count = num_experiments; |
2863 return experiments; | 2871 return experiments; |
2864 } | 2872 } |
2865 | 2873 |
2866 } // namespace testing | 2874 } // namespace testing |
2867 | 2875 |
2868 } // namespace about_flags | 2876 } // namespace about_flags |
OLD | NEW |