| 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 1657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1668 kOsAll, | 1668 kOsAll, |
| 1669 MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices)}, | 1669 MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices)}, |
| 1670 #if !defined(OS_ANDROID) | 1670 #if !defined(OS_ANDROID) |
| 1671 {"enable-message-center-always-scroll-up-upon-notification-removal", | 1671 {"enable-message-center-always-scroll-up-upon-notification-removal", |
| 1672 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME, | 1672 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME, |
| 1673 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION, | 1673 IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION, |
| 1674 kOsDesktop, | 1674 kOsDesktop, |
| 1675 SINGLE_VALUE_TYPE( | 1675 SINGLE_VALUE_TYPE( |
| 1676 switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)}, | 1676 switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)}, |
| 1677 #endif | 1677 #endif |
| 1678 #if !defined(OS_ANDROID) && !defined(OS_IOS) | |
| 1679 {"enable-md-settings", | |
| 1680 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_SETTINGS_NAME, | |
| 1681 IDS_FLAGS_ENABLE_MATERIAL_DESIGN_SETTINGS_DESCRIPTION, | |
| 1682 kOsDesktop, | |
| 1683 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignSettings)}, | |
| 1684 #endif | |
| 1685 #if defined(OS_CHROMEOS) | 1678 #if defined(OS_CHROMEOS) |
| 1686 {"memory-pressure-thresholds", | 1679 {"memory-pressure-thresholds", |
| 1687 IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_NAME, | 1680 IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_NAME, |
| 1688 IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_DESCRIPTION, | 1681 IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_DESCRIPTION, |
| 1689 kOsCrOS, | 1682 kOsCrOS, |
| 1690 MULTI_VALUE_TYPE(kMemoryPressureThresholdChoices)}, | 1683 MULTI_VALUE_TYPE(kMemoryPressureThresholdChoices)}, |
| 1691 {"wake-on-packets", | 1684 {"wake-on-packets", |
| 1692 IDS_FLAGS_WAKE_ON_PACKETS_NAME, | 1685 IDS_FLAGS_WAKE_ON_PACKETS_NAME, |
| 1693 IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION, | 1686 IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION, |
| 1694 kOsCrOSOwnerOnly, | 1687 kOsCrOSOwnerOnly, |
| (...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2723 } | 2716 } |
| 2724 | 2717 |
| 2725 const Experiment* GetExperiments(size_t* count) { | 2718 const Experiment* GetExperiments(size_t* count) { |
| 2726 *count = num_experiments; | 2719 *count = num_experiments; |
| 2727 return experiments; | 2720 return experiments; |
| 2728 } | 2721 } |
| 2729 | 2722 |
| 2730 } // namespace testing | 2723 } // namespace testing |
| 2731 | 2724 |
| 2732 } // namespace about_flags | 2725 } // namespace about_flags |
| OLD | NEW |