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 1479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1490 IDS_FLAGS_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, kOsCrOS, | 1490 IDS_FLAGS_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, kOsCrOS, |
1491 SINGLE_DISABLE_VALUE_TYPE( | 1491 SINGLE_DISABLE_VALUE_TYPE( |
1492 chromeos::switches::kDisableCaptivePortalBypassProxy)}, | 1492 chromeos::switches::kDisableCaptivePortalBypassProxy)}, |
1493 #endif // OS_CHROMEOS | 1493 #endif // OS_CHROMEOS |
1494 #if defined(OS_ANDROID) | 1494 #if defined(OS_ANDROID) |
1495 {"enable-seccomp-sandbox-android", | 1495 {"enable-seccomp-sandbox-android", |
1496 IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, | 1496 IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, |
1497 IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, kOsAndroid, | 1497 IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, kOsAndroid, |
1498 FEATURE_VALUE_TYPE(features::kSeccompSandboxAndroid)}, | 1498 FEATURE_VALUE_TYPE(features::kSeccompSandboxAndroid)}, |
1499 #endif // OS_ANDROID | 1499 #endif // OS_ANDROID |
1500 {"enable-touch-hover", IDS_FLAGS_TOUCH_HOVER_NAME, | |
1501 IDS_FLAGS_TOUCH_HOVER_DESCRIPTION, kOsAndroid, | |
1502 SINGLE_VALUE_TYPE("enable-touch-hover")}, | |
1503 #if defined(OS_CHROMEOS) | 1500 #if defined(OS_CHROMEOS) |
1504 {"enable-wifi-credential-sync", IDS_FLAGS_WIFI_CREDENTIAL_SYNC_NAME, | 1501 {"enable-wifi-credential-sync", IDS_FLAGS_WIFI_CREDENTIAL_SYNC_NAME, |
1505 IDS_FLAGS_WIFI_CREDENTIAL_SYNC_DESCRIPTION, kOsCrOS, | 1502 IDS_FLAGS_WIFI_CREDENTIAL_SYNC_DESCRIPTION, kOsCrOS, |
1506 SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)}, | 1503 SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)}, |
1507 {"enable-potentially-annoying-security-features", | 1504 {"enable-potentially-annoying-security-features", |
1508 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_NAME, | 1505 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_NAME, |
1509 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_DESCRIPTION, kOsAll, | 1506 IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_DESCRIPTION, kOsAll, |
1510 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)}, | 1507 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)}, |
1511 #endif // OS_CHROMEOS | 1508 #endif // OS_CHROMEOS |
1512 {"mark-non-secure-as", IDS_MARK_HTTP_AS_NAME, IDS_MARK_HTTP_AS_DESCRIPTION, | 1509 {"mark-non-secure-as", IDS_MARK_HTTP_AS_NAME, IDS_MARK_HTTP_AS_DESCRIPTION, |
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2383 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2380 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2384 | 2381 |
2385 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2382 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2386 *count = arraysize(kFeatureEntries); | 2383 *count = arraysize(kFeatureEntries); |
2387 return kFeatureEntries; | 2384 return kFeatureEntries; |
2388 } | 2385 } |
2389 | 2386 |
2390 } // namespace testing | 2387 } // namespace testing |
2391 | 2388 |
2392 } // namespace about_flags | 2389 } // namespace about_flags |
OLD | NEW |