| 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 1682 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1693      kOsAll, |  1693      kOsAll, | 
|  1694      MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices)}, |  1694      MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices)}, | 
|  1695 #if !defined(OS_ANDROID) |  1695 #if !defined(OS_ANDROID) | 
|  1696     {"enable-message-center-always-scroll-up-upon-notification-removal", |  1696     {"enable-message-center-always-scroll-up-upon-notification-removal", | 
|  1697      IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME, |  1697      IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME, | 
|  1698      IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION, |  1698      IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION, | 
|  1699      kOsDesktop, |  1699      kOsDesktop, | 
|  1700      SINGLE_VALUE_TYPE( |  1700      SINGLE_VALUE_TYPE( | 
|  1701          switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)}, |  1701          switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)}, | 
|  1702 #endif |  1702 #endif | 
 |  1703     {"enable-md-policy-page", | 
 |  1704      IDS_FLAGS_ENABLE_MATERIAL_DESIGN_POLICY_PAGE_NAME, | 
 |  1705      IDS_FLAGS_ENABLE_MATERIAL_DESIGN_POLICY_PAGE_DESCRIPTION, | 
 |  1706      kOsDesktop, | 
 |  1707      SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignPolicyPage)}, | 
|  1703 #if defined(OS_CHROMEOS) |  1708 #if defined(OS_CHROMEOS) | 
|  1704     {"memory-pressure-thresholds", |  1709     {"memory-pressure-thresholds", | 
|  1705      IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_NAME, |  1710      IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_NAME, | 
|  1706      IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_DESCRIPTION, |  1711      IDS_FLAGS_MEMORY_PRESSURE_THRESHOLD_DESCRIPTION, | 
|  1707      kOsCrOS, |  1712      kOsCrOS, | 
|  1708      MULTI_VALUE_TYPE(kMemoryPressureThresholdChoices)}, |  1713      MULTI_VALUE_TYPE(kMemoryPressureThresholdChoices)}, | 
|  1709     {"wake-on-packets", |  1714     {"wake-on-packets", | 
|  1710      IDS_FLAGS_WAKE_ON_PACKETS_NAME, |  1715      IDS_FLAGS_WAKE_ON_PACKETS_NAME, | 
|  1711      IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION, |  1716      IDS_FLAGS_WAKE_ON_PACKETS_DESCRIPTION, | 
|  1712      kOsCrOSOwnerOnly, |  1717      kOsCrOSOwnerOnly, | 
| (...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2763 } |  2768 } | 
|  2764  |  2769  | 
|  2765 const Experiment* GetExperiments(size_t* count) { |  2770 const Experiment* GetExperiments(size_t* count) { | 
|  2766   *count = num_experiments; |  2771   *count = num_experiments; | 
|  2767   return experiments; |  2772   return experiments; | 
|  2768 } |  2773 } | 
|  2769  |  2774  | 
|  2770 }  // namespace testing |  2775 }  // namespace testing | 
|  2771  |  2776  | 
|  2772 }  // namespace about_flags |  2777 }  // namespace about_flags | 
| OLD | NEW |