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 27 matching lines...) Expand all Loading... |
38 #include "components/omnibox/browser/omnibox_switches.h" | 38 #include "components/omnibox/browser/omnibox_switches.h" |
39 #include "components/password_manager/core/common/password_manager_switches.h" | 39 #include "components/password_manager/core/common/password_manager_switches.h" |
40 #include "components/plugins/common/plugins_switches.h" | 40 #include "components/plugins/common/plugins_switches.h" |
41 #include "components/proximity_auth/switches.h" | 41 #include "components/proximity_auth/switches.h" |
42 #include "components/search/search_switches.h" | 42 #include "components/search/search_switches.h" |
43 #include "components/signin/core/common/signin_switches.h" | 43 #include "components/signin/core/common/signin_switches.h" |
44 #include "components/sync_driver/sync_driver_switches.h" | 44 #include "components/sync_driver/sync_driver_switches.h" |
45 #include "components/tracing/tracing_switches.h" | 45 #include "components/tracing/tracing_switches.h" |
46 #include "components/version_info/version_info.h" | 46 #include "components/version_info/version_info.h" |
47 #include "content/public/browser/user_metrics.h" | 47 #include "content/public/browser/user_metrics.h" |
| 48 #include "content/public/common/content_features.h" |
48 #include "content/public/common/content_switches.h" | 49 #include "content/public/common/content_switches.h" |
49 #include "media/base/media_switches.h" | 50 #include "media/base/media_switches.h" |
50 #include "media/midi/midi_switches.h" | 51 #include "media/midi/midi_switches.h" |
51 #include "ui/base/l10n/l10n_util.h" | 52 #include "ui/base/l10n/l10n_util.h" |
52 #include "ui/base/ui_base_switches.h" | 53 #include "ui/base/ui_base_switches.h" |
53 #include "ui/display/display_switches.h" | 54 #include "ui/display/display_switches.h" |
54 #include "ui/events/event_switches.h" | 55 #include "ui/events/event_switches.h" |
55 #include "ui/gfx/switches.h" | 56 #include "ui/gfx/switches.h" |
56 #include "ui/gl/gl_switches.h" | 57 #include "ui/gl/gl_switches.h" |
57 #include "ui/keyboard/keyboard_switches.h" | 58 #include "ui/keyboard/keyboard_switches.h" |
(...skipping 1690 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1748 ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan, | 1749 ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan, |
1749 autofill::switches::kDisableCreditCardScan)}, | 1750 autofill::switches::kDisableCreditCardScan)}, |
1750 #if defined(OS_CHROMEOS) | 1751 #if defined(OS_CHROMEOS) |
1751 {"disable-captive-portal-bypass-proxy", | 1752 {"disable-captive-portal-bypass-proxy", |
1752 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, | 1753 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME, |
1753 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, | 1754 IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION, |
1754 kOsCrOS, | 1755 kOsCrOS, |
1755 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCaptivePortalBypassProxy)}, | 1756 SINGLE_VALUE_TYPE(chromeos::switches::kDisableCaptivePortalBypassProxy)}, |
1756 #endif // defined(OS_CHROMEOS) | 1757 #endif // defined(OS_CHROMEOS) |
1757 #if defined(OS_ANDROID) | 1758 #if defined(OS_ANDROID) |
1758 {"enable-seccomp-filter-sandbox", | 1759 {"enable-seccomp-sandbox-android", |
1759 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, | 1760 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME, |
1760 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, | 1761 IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION, |
1761 kOsAndroid, | 1762 kOsAndroid, |
1762 SINGLE_VALUE_TYPE(switches::kEnableSeccompFilterSandbox)}, | 1763 FEATURE_VALUE_TYPE(content::kSeccompSandboxAndroidFeature)}, |
1763 #endif | 1764 #endif |
1764 {"enable-touch-hover", | 1765 {"enable-touch-hover", |
1765 IDS_FLAGS_ENABLE_TOUCH_HOVER_NAME, | 1766 IDS_FLAGS_ENABLE_TOUCH_HOVER_NAME, |
1766 IDS_FLAGS_ENABLE_TOUCH_HOVER_DESCRIPTION, | 1767 IDS_FLAGS_ENABLE_TOUCH_HOVER_DESCRIPTION, |
1767 kOsAndroid, | 1768 kOsAndroid, |
1768 SINGLE_VALUE_TYPE("enable-touch-hover")}, | 1769 SINGLE_VALUE_TYPE("enable-touch-hover")}, |
1769 {"enable-fill-on-account-select", | 1770 {"enable-fill-on-account-select", |
1770 IDS_FILL_ON_ACCOUNT_SELECT_NAME, | 1771 IDS_FILL_ON_ACCOUNT_SELECT_NAME, |
1771 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, | 1772 IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, |
1772 kOsAll, | 1773 kOsAll, |
(...skipping 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2978 FlagsState::GetInstance()->SetFeatureEntries(entries, count); | 2979 FlagsState::GetInstance()->SetFeatureEntries(entries, count); |
2979 } | 2980 } |
2980 | 2981 |
2981 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2982 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2982 return FlagsState::GetInstance()->GetFeatureEntries(count); | 2983 return FlagsState::GetInstance()->GetFeatureEntries(count); |
2983 } | 2984 } |
2984 | 2985 |
2985 } // namespace testing | 2986 } // namespace testing |
2986 | 2987 |
2987 } // namespace about_flags | 2988 } // namespace about_flags |
OLD | NEW |