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 2119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2130 kOsAndroid, | 2130 kOsAndroid, |
2131 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, | 2131 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, |
2132 switches::kDisableWebNotificationCustomLayouts)}, | 2132 switches::kDisableWebNotificationCustomLayouts)}, |
2133 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) | 2133 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
2134 #if defined(OS_WIN) | 2134 #if defined(OS_WIN) |
2135 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, | 2135 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, |
2136 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, | 2136 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, |
2137 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, | 2137 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, |
2138 switches::kDisableAppContainer)}, | 2138 switches::kDisableAppContainer)}, |
2139 #endif // defined(OS_WIN) | 2139 #endif // defined(OS_WIN) |
| 2140 #if !defined(DISABLE_BROTLI_SUPPORT) |
| 2141 {"enable-brotli", |
| 2142 IDS_FLAGS_ENABLE_BROTLI_NAME, |
| 2143 IDS_FLAGS_ENABLE_BROTLI_DESCRIPTION, |
| 2144 kOsAll, |
| 2145 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrotli, |
| 2146 switches::kDisableBrotli)}, |
| 2147 #endif |
2140 // NOTE: Adding new command-line switches requires adding corresponding | 2148 // NOTE: Adding new command-line switches requires adding corresponding |
2141 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2149 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2142 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2150 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2143 }; | 2151 }; |
2144 | 2152 |
2145 // Stores and encapsulates the little state that about:flags has. | 2153 // Stores and encapsulates the little state that about:flags has. |
2146 class FlagsState { | 2154 class FlagsState { |
2147 public: | 2155 public: |
2148 FlagsState() | 2156 FlagsState() |
2149 : feature_entries(kFeatureEntries), | 2157 : feature_entries(kFeatureEntries), |
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2978 FlagsState::GetInstance()->SetFeatureEntries(entries, count); | 2986 FlagsState::GetInstance()->SetFeatureEntries(entries, count); |
2979 } | 2987 } |
2980 | 2988 |
2981 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2989 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2982 return FlagsState::GetInstance()->GetFeatureEntries(count); | 2990 return FlagsState::GetInstance()->GetFeatureEntries(count); |
2983 } | 2991 } |
2984 | 2992 |
2985 } // namespace testing | 2993 } // namespace testing |
2986 | 2994 |
2987 } // namespace about_flags | 2995 } // namespace about_flags |
OLD | NEW |