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 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1025 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), | 1025 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), |
1026 }, | 1026 }, |
1027 #if defined(USE_ASH) | 1027 #if defined(USE_ASH) |
1028 { | 1028 { |
1029 "ash-debug-shortcuts", | 1029 "ash-debug-shortcuts", |
1030 IDS_FLAGS_DEBUG_SHORTCUTS_NAME, | 1030 IDS_FLAGS_DEBUG_SHORTCUTS_NAME, |
1031 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, | 1031 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, |
1032 kOsAll, | 1032 kOsAll, |
1033 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 1033 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
1034 }, | 1034 }, |
| 1035 { |
| 1036 "ash-disable-swipe-to-close-in-overview-mode", |
| 1037 IDS_FLAGS_ASH_DISABLE_SWIPE_TO_CLOSE_IN_OVERVIEW_MODE_NAME, |
| 1038 IDS_FLAGS_ASH_DISABLE_SWIPE_TO_CLOSE_IN_OVERVIEW_MODE_DESCRIPTION, |
| 1039 // TODO(bruthig): Add kOsWin when http://crbug.com/333758 is resolved. |
| 1040 kOsCrOS, |
| 1041 SINGLE_VALUE_TYPE(ash::switches::kAshDisableSwipeToCloseInOverviewMode), |
| 1042 }, |
1035 { "ash-enable-touch-view-testing", | 1043 { "ash-enable-touch-view-testing", |
1036 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, | 1044 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
1037 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, | 1045 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, |
1038 kOsCrOS, | 1046 kOsCrOS, |
1039 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), | 1047 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
1040 }, | 1048 }, |
1041 { | 1049 { |
1042 "enable-touch-feedback", | 1050 "enable-touch-feedback", |
1043 IDS_FLAGS_ENABLE_TOUCH_FEEDBACK_NAME, | 1051 IDS_FLAGS_ENABLE_TOUCH_FEEDBACK_NAME, |
1044 IDS_FLAGS_ENABLE_TOUCH_FEEDBACK_DESCRIPTION, | 1052 IDS_FLAGS_ENABLE_TOUCH_FEEDBACK_DESCRIPTION, |
(...skipping 1579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2624 } | 2632 } |
2625 | 2633 |
2626 const Experiment* GetExperiments(size_t* count) { | 2634 const Experiment* GetExperiments(size_t* count) { |
2627 *count = num_experiments; | 2635 *count = num_experiments; |
2628 return experiments; | 2636 return experiments; |
2629 } | 2637 } |
2630 | 2638 |
2631 } // namespace testing | 2639 } // namespace testing |
2632 | 2640 |
2633 } // namespace about_flags | 2641 } // namespace about_flags |
OLD | NEW |