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 1626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1637 }, | 1637 }, |
1638 #if defined(OS_ANDROID) | 1638 #if defined(OS_ANDROID) |
1639 { | 1639 { |
1640 "disable-click-delay", | 1640 "disable-click-delay", |
1641 IDS_FLAGS_DISABLE_CLICK_DELAY_NAME, | 1641 IDS_FLAGS_DISABLE_CLICK_DELAY_NAME, |
1642 IDS_FLAGS_DISABLE_CLICK_DELAY_DESCRIPTION, | 1642 IDS_FLAGS_DISABLE_CLICK_DELAY_DESCRIPTION, |
1643 kOsAndroid, | 1643 kOsAndroid, |
1644 // Java-only switch: CommandLine.DISABLE_CLICK_DELAY | 1644 // Java-only switch: CommandLine.DISABLE_CLICK_DELAY |
1645 SINGLE_VALUE_TYPE("disable-click-delay") | 1645 SINGLE_VALUE_TYPE("disable-click-delay") |
1646 }, | 1646 }, |
| 1647 { |
| 1648 "disable-pull-to-refresh-effect", |
| 1649 IDS_FLAGS_DISABLE_PULL_TO_REFRESH_EFFECT_NAME, |
| 1650 IDS_FLAGS_DISABLE_PULL_TO_REFRESH_EFFECT_DESCRIPTION, |
| 1651 kOsAndroid, |
| 1652 SINGLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect) |
| 1653 }, |
1647 #endif | 1654 #endif |
1648 #if defined(OS_MACOSX) | 1655 #if defined(OS_MACOSX) |
1649 { | 1656 { |
1650 "enable-translate-new-ux", | 1657 "enable-translate-new-ux", |
1651 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_NAME, | 1658 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_NAME, |
1652 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_DESCRIPTION, | 1659 IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_DESCRIPTION, |
1653 kOsMac, | 1660 kOsMac, |
1654 SINGLE_VALUE_TYPE(switches::kEnableTranslateNewUX) | 1661 SINGLE_VALUE_TYPE(switches::kEnableTranslateNewUX) |
1655 }, | 1662 }, |
1656 #endif | 1663 #endif |
(...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2659 } | 2666 } |
2660 | 2667 |
2661 const Experiment* GetExperiments(size_t* count) { | 2668 const Experiment* GetExperiments(size_t* count) { |
2662 *count = num_experiments; | 2669 *count = num_experiments; |
2663 return experiments; | 2670 return experiments; |
2664 } | 2671 } |
2665 | 2672 |
2666 } // namespace testing | 2673 } // namespace testing |
2667 | 2674 |
2668 } // namespace about_flags | 2675 } // namespace about_flags |
OLD | NEW |