| 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 935 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 946 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), | 946 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), |
| 947 }, | 947 }, |
| 948 #if defined(USE_ASH) | 948 #if defined(USE_ASH) |
| 949 { | 949 { |
| 950 "ash-debug-shortcuts", | 950 "ash-debug-shortcuts", |
| 951 IDS_FLAGS_DEBUG_SHORTCUTS_NAME, | 951 IDS_FLAGS_DEBUG_SHORTCUTS_NAME, |
| 952 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, | 952 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, |
| 953 kOsAll, | 953 kOsAll, |
| 954 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 954 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| 955 }, | 955 }, |
| 956 { | |
| 957 "ash-enable-swipe-to-close-in-overview-mode", | |
| 958 IDS_FLAGS_ASH_ENABLE_SWIPE_TO_CLOSE_IN_OVERVIEW_MODE_NAME, | |
| 959 IDS_FLAGS_ASH_ENABLE_SWIPE_TO_CLOSE_IN_OVERVIEW_MODE_DESCRIPTION, | |
| 960 // TODO(bruthig): Add kOsWin when http://crbug.com/333758 is resolved. | |
| 961 kOsCrOS, | |
| 962 SINGLE_VALUE_TYPE(ash::switches::kAshEnableSwipeToCloseInOverviewMode), | |
| 963 }, | |
| 964 { "ash-enable-touch-view-testing", | 956 { "ash-enable-touch-view-testing", |
| 965 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, | 957 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
| 966 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, | 958 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, |
| 967 kOsCrOS, | 959 kOsCrOS, |
| 968 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), | 960 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
| 969 }, | 961 }, |
| 970 { | 962 { |
| 971 "disable-touch-feedback", | 963 "disable-touch-feedback", |
| 972 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_NAME, | 964 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_NAME, |
| 973 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_DESCRIPTION, | 965 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_DESCRIPTION, |
| (...skipping 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2789 } | 2781 } |
| 2790 | 2782 |
| 2791 const Experiment* GetExperiments(size_t* count) { | 2783 const Experiment* GetExperiments(size_t* count) { |
| 2792 *count = num_experiments; | 2784 *count = num_experiments; |
| 2793 return experiments; | 2785 return experiments; |
| 2794 } | 2786 } |
| 2795 | 2787 |
| 2796 } // namespace testing | 2788 } // namespace testing |
| 2797 | 2789 |
| 2798 } // namespace about_flags | 2790 } // namespace about_flags |
| OLD | NEW |