| 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 1634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1645 kOsAll, | 1645 kOsAll, |
| 1646 MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices)}, | 1646 MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices)}, |
| 1647 #if !defined(OS_ANDROID) | 1647 #if !defined(OS_ANDROID) |
| 1648 {"enable-message-center-always-scroll-up-upon-notification-removal", | 1648 {"enable-message-center-always-scroll-up-upon-notification-removal", |
| 1649 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME, | 1649 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME, |
| 1650 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION, | 1650 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION, |
| 1651 kOsDesktop, | 1651 kOsDesktop, |
| 1652 SINGLE_VALUE_TYPE( | 1652 SINGLE_VALUE_TYPE( |
| 1653 switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)}, | 1653 switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)}, |
| 1654 #endif | 1654 #endif |
| 1655 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 1656 {"enable-md-policy-page", |
| 1657 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_POLICY_PAGE_NAME, |
| 1658 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_POLICY_PAGE_DESCRIPTION, |
| 1659 kOsDesktop, |
| 1660 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignPolicyPage)}, |
| 1661 #endif |
| 1655 #if defined(OS_CHROMEOS) | 1662 #if defined(OS_CHROMEOS) |
| 1656 {"memory-pressure-thresholds", | 1663 {"memory-pressure-thresholds", |
| 1657 IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_NAME, | 1664 IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_NAME, |
| 1658 IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_DESCRIPTION, | 1665 IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_DESCRIPTION, |
| 1659 kOsCrOS, | 1666 kOsCrOS, |
| 1660 MULTI_VALUE_TYPE(kMemoryPressureThresholdChoices)}, | 1667 MULTI_VALUE_TYPE(kMemoryPressureThresholdChoices)}, |
| 1661 {"wake-on-packets", | 1668 {"wake-on-packets", |
| 1662 IDS_FLAGS_WAKE_ON_PACKETS_NAME, | 1669 IDS_FLAGS_WAKE_ON_PACKETS_NAME, |
| 1663 IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION, | 1670 IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION, |
| 1664 kOsCrOSOwnerOnly, | 1671 kOsCrOSOwnerOnly, |
| (...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2708 } | 2715 } |
| 2709 | 2716 |
| 2710 const Experiment* GetExperiments(size_t* count) { | 2717 const Experiment* GetExperiments(size_t* count) { |
| 2711 *count = num_experiments; | 2718 *count = num_experiments; |
| 2712 return experiments; | 2719 return experiments; |
| 2713 } | 2720 } |
| 2714 | 2721 |
| 2715 } // namespace testing | 2722 } // namespace testing |
| 2716 | 2723 |
| 2717 } // namespace about_flags | 2724 } // namespace about_flags |
| OLD | NEW |