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 2098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2109 kOsAndroid, | 2109 kOsAndroid, |
2110 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, | 2110 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, |
2111 switches::kDisableWebNotificationCustomLayouts)}, | 2111 switches::kDisableWebNotificationCustomLayouts)}, |
2112 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) | 2112 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
2113 #if defined(OS_WIN) | 2113 #if defined(OS_WIN) |
2114 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, | 2114 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, |
2115 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, | 2115 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, |
2116 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, | 2116 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, |
2117 switches::kDisableAppContainer)}, | 2117 switches::kDisableAppContainer)}, |
2118 #endif // defined(OS_WIN) | 2118 #endif // defined(OS_WIN) |
| 2119 #if !defined(DISABLE_BROTLI_SUPPORT) |
| 2120 {"enable-brotli", |
| 2121 IDS_FLAGS_ENABLE_BROTLI_NAME, |
| 2122 IDS_FLAGS_ENABLE_BROTLI_DESCRIPTION, |
| 2123 kOsAll, |
| 2124 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrotli, |
| 2125 switches::kDisableBrotli)}, |
| 2126 #endif |
2119 #if defined(OS_ANDROID) | 2127 #if defined(OS_ANDROID) |
2120 {"disable-auto-hiding-toolbar-threshold", | 2128 {"disable-auto-hiding-toolbar-threshold", |
2121 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_NAME, | 2129 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_NAME, |
2122 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION, | 2130 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION, |
2123 kOsAndroid, | 2131 kOsAndroid, |
2124 SINGLE_VALUE_TYPE_AND_VALUE(switches::kDisableAutoHidingToolbarThreshold, | 2132 SINGLE_VALUE_TYPE_AND_VALUE(switches::kDisableAutoHidingToolbarThreshold, |
2125 "0")}, | 2133 "0")}, |
2126 #endif | 2134 #endif |
2127 #if defined(TOOLKIT_VIEWS) | 2135 #if defined(TOOLKIT_VIEWS) |
2128 {"enable-autofill-credit-card-upload", | 2136 {"enable-autofill-credit-card-upload", |
(...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2974 FlagsState::GetInstance()->SetFeatureEntries(entries, count); | 2982 FlagsState::GetInstance()->SetFeatureEntries(entries, count); |
2975 } | 2983 } |
2976 | 2984 |
2977 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2985 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2978 return FlagsState::GetInstance()->GetFeatureEntries(count); | 2986 return FlagsState::GetInstance()->GetFeatureEntries(count); |
2979 } | 2987 } |
2980 | 2988 |
2981 } // namespace testing | 2989 } // namespace testing |
2982 | 2990 |
2983 } // namespace about_flags | 2991 } // namespace about_flags |
OLD | NEW |