| 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 942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 953 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), | 953 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), |
| 954 }, | 954 }, |
| 955 #if defined(USE_ASH) | 955 #if defined(USE_ASH) |
| 956 { | 956 { |
| 957 "ash-debug-shortcuts", | 957 "ash-debug-shortcuts", |
| 958 IDS_FLAGS_DEBUG_SHORTCUTS_NAME, | 958 IDS_FLAGS_DEBUG_SHORTCUTS_NAME, |
| 959 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, | 959 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, |
| 960 kOsAll, | 960 kOsAll, |
| 961 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 961 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| 962 }, | 962 }, |
| 963 { |
| 964 "ash-disable-swipe-to-close-in-overview-mode", |
| 965 IDS_FLAGS_ASH_DISABLE_SWIPE_TO_CLOSE_IN_OVERVIEW_MODE_NAME, |
| 966 IDS_FLAGS_ASH_DISABLE_SWIPE_TO_CLOSE_IN_OVERVIEW_MODE_DESCRIPTION, |
| 967 // TODO(bruthig): Add kOsWin when http://crbug.com/333758 is resolved. |
| 968 kOsCrOS, |
| 969 SINGLE_VALUE_TYPE(ash::switches::kAshDisableSwipeToCloseInOverviewMode), |
| 970 }, |
| 963 { "ash-enable-touch-view-testing", | 971 { "ash-enable-touch-view-testing", |
| 964 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, | 972 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
| 965 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, | 973 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, |
| 966 kOsCrOS, | 974 kOsCrOS, |
| 967 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), | 975 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
| 968 }, | 976 }, |
| 969 { | 977 { |
| 970 "disable-touch-feedback", | 978 "disable-touch-feedback", |
| 971 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_NAME, | 979 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_NAME, |
| 972 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_DESCRIPTION, | 980 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_DESCRIPTION, |
| (...skipping 1754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2727 } | 2735 } |
| 2728 | 2736 |
| 2729 const Experiment* GetExperiments(size_t* count) { | 2737 const Experiment* GetExperiments(size_t* count) { |
| 2730 *count = num_experiments; | 2738 *count = num_experiments; |
| 2731 return experiments; | 2739 return experiments; |
| 2732 } | 2740 } |
| 2733 | 2741 |
| 2734 } // namespace testing | 2742 } // namespace testing |
| 2735 | 2743 |
| 2736 } // namespace about_flags | 2744 } // namespace about_flags |
| OLD | NEW |