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 2045 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2056 kOsAndroid, | 2056 kOsAndroid, |
2057 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, | 2057 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, |
2058 switches::kDisableWebNotificationCustomLayouts)}, | 2058 switches::kDisableWebNotificationCustomLayouts)}, |
2059 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) | 2059 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
2060 #if defined(OS_WIN) | 2060 #if defined(OS_WIN) |
2061 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, | 2061 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, |
2062 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, | 2062 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, |
2063 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, | 2063 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, |
2064 switches::kDisableAppContainer)}, | 2064 switches::kDisableAppContainer)}, |
2065 #endif // defined(OS_WIN) | 2065 #endif // defined(OS_WIN) |
| 2066 #if !defined(DISABLE_BROTLI_SUPPORT) |
| 2067 {"enable-brotli", |
| 2068 IDS_FLAGS_ENABLE_BROTLI_NAME, |
| 2069 IDS_FLAGS_ENABLE_BROTLI_DESCRIPTION, |
| 2070 kOsAll, |
| 2071 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrotli, |
| 2072 switches::kDisableBrotli)}, |
| 2073 #endif |
2066 #if defined(OS_ANDROID) | 2074 #if defined(OS_ANDROID) |
2067 {"disable-auto-hiding-toolbar-threshold", | 2075 {"disable-auto-hiding-toolbar-threshold", |
2068 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_NAME, | 2076 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_NAME, |
2069 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION, | 2077 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION, |
2070 kOsAndroid, | 2078 kOsAndroid, |
2071 SINGLE_VALUE_TYPE_AND_VALUE(switches::kDisableAutoHidingToolbarThreshold, | 2079 SINGLE_VALUE_TYPE_AND_VALUE(switches::kDisableAutoHidingToolbarThreshold, |
2072 "800")}, | 2080 "800")}, |
2073 #endif | 2081 #endif |
2074 #if defined(TOOLKIT_VIEWS) | 2082 #if defined(TOOLKIT_VIEWS) |
2075 {"enable-autofill-credit-card-upload", | 2083 {"enable-autofill-credit-card-upload", |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2309 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2317 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2310 | 2318 |
2311 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2319 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2312 *count = arraysize(kFeatureEntries); | 2320 *count = arraysize(kFeatureEntries); |
2313 return kFeatureEntries; | 2321 return kFeatureEntries; |
2314 } | 2322 } |
2315 | 2323 |
2316 } // namespace testing | 2324 } // namespace testing |
2317 | 2325 |
2318 } // namespace about_flags | 2326 } // namespace about_flags |
OLD | NEW |