| 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 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1078 { | 1078 { |
| 1079 "scroll-end-effect", | 1079 "scroll-end-effect", |
| 1080 IDS_FLAGS_SCROLL_END_EFFECT_NAME, | 1080 IDS_FLAGS_SCROLL_END_EFFECT_NAME, |
| 1081 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, | 1081 IDS_FLAGS_SCROLL_END_EFFECT_DESCRIPTION, |
| 1082 kOsCrOS, | 1082 kOsCrOS, |
| 1083 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( | 1083 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
| 1084 switches::kScrollEndEffect, "1", | 1084 switches::kScrollEndEffect, "1", |
| 1085 switches::kScrollEndEffect, "0") | 1085 switches::kScrollEndEffect, "0") |
| 1086 }, | 1086 }, |
| 1087 { | 1087 { |
| 1088 "enable-renderer-mojo-channel", | |
| 1089 IDS_FLAGS_ENABLE_RENDERER_MOJO_CHANNEL_NAME, | |
| 1090 IDS_FLAGS_ENABLE_RENDERER_MOJO_CHANNEL_DESCRIPTION, | |
| 1091 kOsAll, | |
| 1092 SINGLE_VALUE_TYPE(switches::kEnableRendererMojoChannel) | |
| 1093 }, | |
| 1094 { | |
| 1095 "enable-touch-drag-drop", | 1088 "enable-touch-drag-drop", |
| 1096 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, | 1089 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME, |
| 1097 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, | 1090 IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION, |
| 1098 kOsWin | kOsCrOS, | 1091 kOsWin | kOsCrOS, |
| 1099 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, | 1092 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop, |
| 1100 switches::kDisableTouchDragDrop) | 1093 switches::kDisableTouchDragDrop) |
| 1101 }, | 1094 }, |
| 1102 { | 1095 { |
| 1103 "enable-touch-editing", | 1096 "enable-touch-editing", |
| 1104 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, | 1097 IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME, |
| (...skipping 1628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2733 } | 2726 } |
| 2734 | 2727 |
| 2735 const Experiment* GetExperiments(size_t* count) { | 2728 const Experiment* GetExperiments(size_t* count) { |
| 2736 *count = num_experiments; | 2729 *count = num_experiments; |
| 2737 return experiments; | 2730 return experiments; |
| 2738 } | 2731 } |
| 2739 | 2732 |
| 2740 } // namespace testing | 2733 } // namespace testing |
| 2741 | 2734 |
| 2742 } // namespace about_flags | 2735 } // namespace about_flags |
| OLD | NEW |