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 2104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2115 IDS_FLAGS_CROS_REGIONS_MODE_DESCRIPTION, | 2115 IDS_FLAGS_CROS_REGIONS_MODE_DESCRIPTION, |
2116 kOsCrOS, | 2116 kOsCrOS, |
2117 MULTI_VALUE_TYPE(kCrosRegionsModeChoices)}, | 2117 MULTI_VALUE_TYPE(kCrosRegionsModeChoices)}, |
2118 #endif // OS_CHROMEOS | 2118 #endif // OS_CHROMEOS |
2119 #if defined(OS_WIN) | 2119 #if defined(OS_WIN) |
2120 {"enable-ppapi-win32k-lockdown", | 2120 {"enable-ppapi-win32k-lockdown", |
2121 IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_NAME, | 2121 IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_NAME, |
2122 IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_DESCRIPTION, kOsWin, | 2122 IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_DESCRIPTION, kOsWin, |
2123 MULTI_VALUE_TYPE(kPpapiWin32kLockdown)}, | 2123 MULTI_VALUE_TYPE(kPpapiWin32kLockdown)}, |
2124 #endif // defined(OS_WIN) | 2124 #endif // defined(OS_WIN) |
| 2125 #if defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
| 2126 {"enable-notifications-custom-layouts", |
| 2127 IDS_FLAGS_ENABLE_NOTIFICATIONS_CUSTOM_LAYOUTS_NAME, |
| 2128 IDS_FLAGS_ENABLE_NOTIFICATIONS_CUSTOM_LAYOUTS_DESCRIPTION, |
| 2129 kOsAndroid, |
| 2130 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNotificationsCustomLayouts, |
| 2131 switches::kDisableNotificationsCustomLayouts)}, |
| 2132 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
2125 // NOTE: Adding new command-line switches requires adding corresponding | 2133 // NOTE: Adding new command-line switches requires adding corresponding |
2126 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2134 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2127 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2135 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2128 }; | 2136 }; |
2129 | 2137 |
2130 const Experiment* experiments = kExperiments; | 2138 const Experiment* experiments = kExperiments; |
2131 size_t num_experiments = arraysize(kExperiments); | 2139 size_t num_experiments = arraysize(kExperiments); |
2132 | 2140 |
2133 // Stores and encapsulates the little state that about:flags has. | 2141 // Stores and encapsulates the little state that about:flags has. |
2134 class FlagsState { | 2142 class FlagsState { |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2757 } | 2765 } |
2758 | 2766 |
2759 const Experiment* GetExperiments(size_t* count) { | 2767 const Experiment* GetExperiments(size_t* count) { |
2760 *count = num_experiments; | 2768 *count = num_experiments; |
2761 return experiments; | 2769 return experiments; |
2762 } | 2770 } |
2763 | 2771 |
2764 } // namespace testing | 2772 } // namespace testing |
2765 | 2773 |
2766 } // namespace about_flags | 2774 } // namespace about_flags |
OLD | NEW |