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 2032 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2043 kOsAndroid, | 2043 kOsAndroid, |
2044 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, | 2044 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, |
2045 switches::kDisableWebNotificationCustomLayouts)}, | 2045 switches::kDisableWebNotificationCustomLayouts)}, |
2046 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) | 2046 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
2047 #if defined(OS_WIN) | 2047 #if defined(OS_WIN) |
2048 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, | 2048 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, |
2049 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, | 2049 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, |
2050 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, | 2050 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, |
2051 switches::kDisableAppContainer)}, | 2051 switches::kDisableAppContainer)}, |
2052 #endif // defined(OS_WIN) | 2052 #endif // defined(OS_WIN) |
| 2053 #if !defined(DISABLE_BROTLI_SUPPORT) |
| 2054 {"enable-brotli", |
| 2055 IDS_FLAGS_ENABLE_BROTLI_NAME, |
| 2056 IDS_FLAGS_ENABLE_BROTLI_DESCRIPTION, |
| 2057 kOsAll, |
| 2058 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrotli, |
| 2059 switches::kDisableBrotli)}, |
| 2060 #endif |
2053 #if defined(OS_ANDROID) | 2061 #if defined(OS_ANDROID) |
2054 {"disable-auto-hiding-toolbar-threshold", | 2062 {"disable-auto-hiding-toolbar-threshold", |
2055 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_NAME, | 2063 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_NAME, |
2056 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION, | 2064 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION, |
2057 kOsAndroid, | 2065 kOsAndroid, |
2058 SINGLE_VALUE_TYPE_AND_VALUE(switches::kDisableAutoHidingToolbarThreshold, | 2066 SINGLE_VALUE_TYPE_AND_VALUE(switches::kDisableAutoHidingToolbarThreshold, |
2059 "800")}, | 2067 "800")}, |
2060 #endif | 2068 #endif |
2061 #if defined(TOOLKIT_VIEWS) | 2069 #if defined(TOOLKIT_VIEWS) |
2062 {"enable-autofill-credit-card-upload", | 2070 {"enable-autofill-credit-card-upload", |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2284 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2292 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2285 | 2293 |
2286 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2294 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2287 *count = arraysize(kFeatureEntries); | 2295 *count = arraysize(kFeatureEntries); |
2288 return kFeatureEntries; | 2296 return kFeatureEntries; |
2289 } | 2297 } |
2290 | 2298 |
2291 } // namespace testing | 2299 } // namespace testing |
2292 | 2300 |
2293 } // namespace about_flags | 2301 } // namespace about_flags |
OLD | NEW |