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 2071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2082 kOsAndroid, | 2082 kOsAndroid, |
2083 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, | 2083 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableWebNotificationCustomLayouts, |
2084 switches::kDisableWebNotificationCustomLayouts)}, | 2084 switches::kDisableWebNotificationCustomLayouts)}, |
2085 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) | 2085 #endif // defined(ENABLE_NOTIFICATIONS) && defined(OS_ANDROID) |
2086 #if defined(OS_WIN) | 2086 #if defined(OS_WIN) |
2087 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, | 2087 {"enable-appcontainer", IDS_FLAGS_ENABLE_APPCONTAINER_NAME, |
2088 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, | 2088 IDS_FLAGS_ENABLE_APPCONTAINER_DESCRIPTION, kOsWin, |
2089 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, | 2089 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppContainer, |
2090 switches::kDisableAppContainer)}, | 2090 switches::kDisableAppContainer)}, |
2091 #endif // defined(OS_WIN) | 2091 #endif // defined(OS_WIN) |
| 2092 #if !defined(DISABLE_BROTLI_SUPPORT) |
| 2093 {"enable-brotli", |
| 2094 IDS_FLAGS_ENABLE_BROTLI_NAME, |
| 2095 IDS_FLAGS_ENABLE_BROTLI_DESCRIPTION, |
| 2096 kOsAll, |
| 2097 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableBrotli, |
| 2098 switches::kDisableBrotli)}, |
| 2099 #endif |
2092 #if defined(OS_ANDROID) | 2100 #if defined(OS_ANDROID) |
2093 {"disable-auto-hiding-toolbar-threshold", | 2101 {"disable-auto-hiding-toolbar-threshold", |
2094 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_NAME, | 2102 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_NAME, |
2095 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION, | 2103 IDS_FLAGS_DISABLE_AUTO_HIDING_TOOLBAR_DESCRIPTION, |
2096 kOsAndroid, | 2104 kOsAndroid, |
2097 SINGLE_VALUE_TYPE_AND_VALUE(switches::kDisableAutoHidingToolbarThreshold, | 2105 SINGLE_VALUE_TYPE_AND_VALUE(switches::kDisableAutoHidingToolbarThreshold, |
2098 "800")}, | 2106 "800")}, |
2099 #endif | 2107 #endif |
2100 #if defined(TOOLKIT_VIEWS) | 2108 #if defined(TOOLKIT_VIEWS) |
2101 {"enable-autofill-credit-card-upload", | 2109 {"enable-autofill-credit-card-upload", |
(...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2914 FlagsState::GetInstance()->SetFeatureEntries(entries, count); | 2922 FlagsState::GetInstance()->SetFeatureEntries(entries, count); |
2915 } | 2923 } |
2916 | 2924 |
2917 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2925 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2918 return FlagsState::GetInstance()->GetFeatureEntries(count); | 2926 return FlagsState::GetInstance()->GetFeatureEntries(count); |
2919 } | 2927 } |
2920 | 2928 |
2921 } // namespace testing | 2929 } // namespace testing |
2922 | 2930 |
2923 } // namespace about_flags | 2931 } // namespace about_flags |
OLD | NEW |