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 1310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1321 flag_descriptions::kTouchAdjustmentDescription, | 1321 flag_descriptions::kTouchAdjustmentDescription, |
1322 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, | 1322 kOsWin | kOsLinux | kOsCrOS | kOsAndroid, |
1323 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, | 1323 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)}, |
1324 #if defined(OS_CHROMEOS) | 1324 #if defined(OS_CHROMEOS) |
1325 {"network-portal-notification", | 1325 {"network-portal-notification", |
1326 flag_descriptions::kNetworkPortalNotificationName, | 1326 flag_descriptions::kNetworkPortalNotificationName, |
1327 flag_descriptions::kNetworkPortalNotificationDescription, kOsCrOS, | 1327 flag_descriptions::kNetworkPortalNotificationDescription, kOsCrOS, |
1328 ENABLE_DISABLE_VALUE_TYPE( | 1328 ENABLE_DISABLE_VALUE_TYPE( |
1329 chromeos::switches::kEnableNetworkPortalNotification, | 1329 chromeos::switches::kEnableNetworkPortalNotification, |
1330 chromeos::switches::kDisableNetworkPortalNotification)}, | 1330 chromeos::switches::kDisableNetworkPortalNotification)}, |
| 1331 {"network-settings-config", flag_descriptions::kNetworkSettingsConfigName, |
| 1332 flag_descriptions::kNetworkSettingsConfigDescription, kOsCrOS, |
| 1333 SINGLE_VALUE_TYPE(chromeos::switches::kNetworkSettingsConfig)}, |
1331 #endif // OS_CHROMEOS | 1334 #endif // OS_CHROMEOS |
1332 #if defined(OS_ANDROID) | 1335 #if defined(OS_ANDROID) |
1333 {"enable-media-document-download-button", | 1336 {"enable-media-document-download-button", |
1334 flag_descriptions::kMediaDocumentDownloadButtonName, | 1337 flag_descriptions::kMediaDocumentDownloadButtonName, |
1335 flag_descriptions::kMediaDocumentDownloadButtonDescription, kOsAndroid, | 1338 flag_descriptions::kMediaDocumentDownloadButtonDescription, kOsAndroid, |
1336 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)}, | 1339 FEATURE_VALUE_TYPE(features::kMediaDocumentDownloadButton)}, |
1337 #endif // OS_ANDROID | 1340 #endif // OS_ANDROID |
1338 #if BUILDFLAG(ENABLE_PLUGINS) | 1341 #if BUILDFLAG(ENABLE_PLUGINS) |
1339 {"prefer-html-over-flash", flag_descriptions::kPreferHtmlOverPluginsName, | 1342 {"prefer-html-over-flash", flag_descriptions::kPreferHtmlOverPluginsName, |
1340 flag_descriptions::kPreferHtmlOverPluginsDescription, kOsDesktop, | 1343 flag_descriptions::kPreferHtmlOverPluginsDescription, kOsDesktop, |
(...skipping 1892 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3233 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 3236 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
3234 | 3237 |
3235 const FeatureEntry* GetFeatureEntries(size_t* count) { | 3238 const FeatureEntry* GetFeatureEntries(size_t* count) { |
3236 *count = arraysize(kFeatureEntries); | 3239 *count = arraysize(kFeatureEntries); |
3237 return kFeatureEntries; | 3240 return kFeatureEntries; |
3238 } | 3241 } |
3239 | 3242 |
3240 } // namespace testing | 3243 } // namespace testing |
3241 | 3244 |
3242 } // namespace about_flags | 3245 } // namespace about_flags |
OLD | NEW |