| 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 907 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 918 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), | 918 SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), |
| 919 }, | 919 }, |
| 920 #if defined(USE_ASH) | 920 #if defined(USE_ASH) |
| 921 { | 921 { |
| 922 "ash-debug-shortcuts", | 922 "ash-debug-shortcuts", |
| 923 IDS_FLAGS_DEBUG_SHORTCUTS_NAME, | 923 IDS_FLAGS_DEBUG_SHORTCUTS_NAME, |
| 924 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, | 924 IDS_FLAGS_DEBUG_SHORTCUTS_DESCRIPTION, |
| 925 kOsAll, | 925 kOsAll, |
| 926 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), | 926 SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), |
| 927 }, | 927 }, |
| 928 { |
| 929 "ash-disable-swipe-to-close-in-overview-mode", |
| 930 IDS_FLAGS_ASH_DISABLE_SWIPE_TO_CLOSE_IN_OVERVIEW_MODE_NAME, |
| 931 IDS_FLAGS_ASH_DISABLE_SWIPE_TO_CLOSE_IN_OVERVIEW_MODE_DESCRIPTION, |
| 932 // TODO(bruthig): Add kOsWin when http://crbug.com/333758 is resolved. |
| 933 kOsCrOS, |
| 934 SINGLE_VALUE_TYPE(ash::switches::kAshDisableSwipeToCloseInOverviewMode), |
| 935 }, |
| 928 { "ash-enable-touch-view-testing", | 936 { "ash-enable-touch-view-testing", |
| 929 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, | 937 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_NAME, |
| 930 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, | 938 IDS_FLAGS_ASH_ENABLE_TOUCH_VIEW_TESTING_DESCRIPTION, |
| 931 kOsCrOS, | 939 kOsCrOS, |
| 932 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), | 940 SINGLE_VALUE_TYPE(ash::switches::kAshEnableTouchViewTesting), |
| 933 }, | 941 }, |
| 934 { | 942 { |
| 935 "disable-touch-feedback", | 943 "disable-touch-feedback", |
| 936 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_NAME, | 944 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_NAME, |
| 937 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_DESCRIPTION, | 945 IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_DESCRIPTION, |
| (...skipping 1721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2659 } | 2667 } |
| 2660 | 2668 |
| 2661 const Experiment* GetExperiments(size_t* count) { | 2669 const Experiment* GetExperiments(size_t* count) { |
| 2662 *count = num_experiments; | 2670 *count = num_experiments; |
| 2663 return experiments; | 2671 return experiments; |
| 2664 } | 2672 } |
| 2665 | 2673 |
| 2666 } // namespace testing | 2674 } // namespace testing |
| 2667 | 2675 |
| 2668 } // namespace about_flags | 2676 } // namespace about_flags |
| OLD | NEW |