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 1698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1709 }, | 1709 }, |
1710 #endif | 1710 #endif |
1711 { | 1711 { |
1712 "touch-scrolling-mode", | 1712 "touch-scrolling-mode", |
1713 IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME, | 1713 IDS_FLAGS_TOUCH_SCROLLING_MODE_NAME, |
1714 IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION, | 1714 IDS_FLAGS_TOUCH_SCROLLING_MODE_DESCRIPTION, |
1715 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, | 1715 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
1716 MULTI_VALUE_TYPE(kTouchScrollingModeChoices) | 1716 MULTI_VALUE_TYPE(kTouchScrollingModeChoices) |
1717 }, | 1717 }, |
1718 { | 1718 { |
| 1719 "disable-threaded-scrolling", |
| 1720 IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME, |
| 1721 IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION, |
| 1722 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
| 1723 SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling) |
| 1724 }, |
| 1725 { |
1719 "bleeding-edge-renderer-mode", | 1726 "bleeding-edge-renderer-mode", |
1720 IDS_FLAGS_BLEEDING_RENDERER_NAME, | 1727 IDS_FLAGS_BLEEDING_RENDERER_NAME, |
1721 IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION, | 1728 IDS_FLAGS_BLEEDING_RENDERER_DESCRIPTION, |
1722 kOsAndroid, | 1729 kOsAndroid, |
1723 SINGLE_VALUE_TYPE(switches::kEnableBleedingEdgeRenderingFastPaths) | 1730 SINGLE_VALUE_TYPE(switches::kEnableBleedingEdgeRenderingFastPaths) |
1724 }, | 1731 }, |
1725 { | 1732 { |
1726 "enable-settings-window", | 1733 "enable-settings-window", |
1727 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_NAME, | 1734 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_NAME, |
1728 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_DESCRIPTION, | 1735 IDS_FLAGS_ENABLE_SETTINGS_WINDOW_DESCRIPTION, |
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2508 } | 2515 } |
2509 | 2516 |
2510 const Experiment* GetExperiments(size_t* count) { | 2517 const Experiment* GetExperiments(size_t* count) { |
2511 *count = num_experiments; | 2518 *count = num_experiments; |
2512 return experiments; | 2519 return experiments; |
2513 } | 2520 } |
2514 | 2521 |
2515 } // namespace testing | 2522 } // namespace testing |
2516 | 2523 |
2517 } // namespace about_flags | 2524 } // namespace about_flags |
OLD | NEW |