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 MULTI_VALUE_TYPE(kPpapiWin32kLockdown)}, | 2115 MULTI_VALUE_TYPE(kPpapiWin32kLockdown)}, |
2116 #endif // defined(OS_WIN) | 2116 #endif // defined(OS_WIN) |
2117 #if defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) | 2117 #if defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
2118 {"enable-web-notification-custom-layouts", | 2118 {"enable-web-notification-custom-layouts", |
2119 IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_NAME, | 2119 IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_NAME, |
2120 IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_DESCRIPTION, | 2120 IDS_FLAGS_ENABLE_WEB_NOTIFICATION_CUSTOM_LAYOUTS_DESCRIPTION, |
2121 kOsAndroid, | 2121 kOsAndroid, |
2122 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, | 2122 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, |
2123 switches::kDisableWebNotificationCustomLayouts)}, | 2123 switches::kDisableWebNotificationCustomLayouts)}, |
2124 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) | 2124 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
| 2125 #if defined(OS_WIN) |
| 2126 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, |
| 2127 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, |
| 2128 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, |
| 2129 switches::kDisableAppContainer)}, |
| 2130 #endif // defined(OS_WIN) |
2125 // NOTE: Adding new command-line switches requires adding corresponding | 2131 // NOTE: Adding new command-line switches requires adding corresponding |
2126 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2132 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2127 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2133 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2128 }; | 2134 }; |
2129 | 2135 |
2130 // Stores and encapsulates the little state that about:flags has. | 2136 // Stores and encapsulates the little state that about:flags has. |
2131 class FlagsState { | 2137 class FlagsState { |
2132 public: | 2138 public: |
2133 FlagsState() | 2139 FlagsState() |
2134 : feature_entries(kFeatureEntries), | 2140 : feature_entries(kFeatureEntries), |
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2964 FlagsState::GetInstance()->SetFeatureEntries(entries, count); | 2970 FlagsState::GetInstance()->SetFeatureEntries(entries, count); |
2965 } | 2971 } |
2966 | 2972 |
2967 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2973 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2968 return FlagsState::GetInstance()->GetFeatureEntries(count); | 2974 return FlagsState::GetInstance()->GetFeatureEntries(count); |
2969 } | 2975 } |
2970 | 2976 |
2971 } // namespace testing | 2977 } // namespace testing |
2972 | 2978 |
2973 } // namespace about_flags | 2979 } // namespace about_flags |
OLD | NEW |