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 2101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2112 IDS_FLAGS_CROS_REGIONS_MODE_DESCRIPTION, | 2112 IDS_FLAGS_CROS_REGIONS_MODE_DESCRIPTION, |
2113 kOsCrOS, | 2113 kOsCrOS, |
2114 MULTI_VALUE_TYPE(kCrosRegionsModeChoices)}, | 2114 MULTI_VALUE_TYPE(kCrosRegionsModeChoices)}, |
2115 #endif // OS_CHROMEOS | 2115 #endif // OS_CHROMEOS |
2116 #if defined(OS_WIN) | 2116 #if defined(OS_WIN) |
2117 {"enable-ppapi-win32k-lockdown", | 2117 {"enable-ppapi-win32k-lockdown", |
2118 IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_NAME, | 2118 IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_NAME, |
2119 IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_DESCRIPTION, kOsWin, | 2119 IDS_FLAGS_PPAPI_WIN32K_LOCKDOWN_DESCRIPTION, kOsWin, |
2120 MULTI_VALUE_TYPE(kPpapiWin32kLockdown)}, | 2120 MULTI_VALUE_TYPE(kPpapiWin32kLockdown)}, |
2121 #endif // defined(OS_WIN) | 2121 #endif // defined(OS_WIN) |
| 2122 #if defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
| 2123 {"enable-web-notification-custom-layouts", |
| 2124 IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_NAME, |
| 2125 IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_DESCRIPTION, |
| 2126 kOsAndroid, |
| 2127 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, |
| 2128 switches::kDisableWebNotificationCustomLayouts)}, |
| 2129 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
2122 // NOTE: Adding new command-line switches requires adding corresponding | 2130 // NOTE: Adding new command-line switches requires adding corresponding |
2123 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2131 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2124 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2132 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2125 }; | 2133 }; |
2126 | 2134 |
2127 // Stores and encapsulates the little state that about:flags has. | 2135 // Stores and encapsulates the little state that about:flags has. |
2128 class FlagsState { | 2136 class FlagsState { |
2129 public: | 2137 public: |
2130 FlagsState() | 2138 FlagsState() |
2131 : feature_entries(kFeatureEntries), | 2139 : feature_entries(kFeatureEntries), |
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2792 FlagsState::GetInstance()->SetFeatureEntries(entries, count); | 2800 FlagsState::GetInstance()->SetFeatureEntries(entries, count); |
2793 } | 2801 } |
2794 | 2802 |
2795 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2803 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2796 return FlagsState::GetInstance()->GetFeatureEntries(count); | 2804 return FlagsState::GetInstance()->GetFeatureEntries(count); |
2797 } | 2805 } |
2798 | 2806 |
2799 } // namespace testing | 2807 } // namespace testing |
2800 | 2808 |
2801 } // namespace about_flags | 2809 } // namespace about_flags |
OLD | NEW |