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 10 matching lines...) Expand all Loading... |
21 #include "cc/base/switches.h" | 21 #include "cc/base/switches.h" |
22 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" | 22 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" |
23 #include "chrome/browser/flags_storage.h" | 23 #include "chrome/browser/flags_storage.h" |
24 #include "chrome/common/chrome_content_client.h" | 24 #include "chrome/common/chrome_content_client.h" |
25 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
26 #include "chrome/grit/generated_resources.h" | 26 #include "chrome/grit/generated_resources.h" |
27 #include "components/autofill/core/common/autofill_switches.h" | 27 #include "components/autofill/core/common/autofill_switches.h" |
28 #include "components/cloud_devices/common/cloud_devices_switches.h" | 28 #include "components/cloud_devices/common/cloud_devices_switches.h" |
29 #include "components/metrics/metrics_hashes.h" | 29 #include "components/metrics/metrics_hashes.h" |
30 #include "components/nacl/common/nacl_switches.h" | 30 #include "components/nacl/common/nacl_switches.h" |
| 31 #include "components/proximity_auth/switches.h" |
31 #include "components/search/search_switches.h" | 32 #include "components/search/search_switches.h" |
32 #include "content/public/browser/user_metrics.h" | 33 #include "content/public/browser/user_metrics.h" |
33 #include "media/base/media_switches.h" | 34 #include "media/base/media_switches.h" |
34 #include "ui/base/l10n/l10n_util.h" | 35 #include "ui/base/l10n/l10n_util.h" |
35 #include "ui/base/ui_base_switches.h" | 36 #include "ui/base/ui_base_switches.h" |
36 #include "ui/display/display_switches.h" | 37 #include "ui/display/display_switches.h" |
37 #include "ui/events/event_switches.h" | 38 #include "ui/events/event_switches.h" |
38 #include "ui/gfx/switches.h" | 39 #include "ui/gfx/switches.h" |
39 #include "ui/gl/gl_switches.h" | 40 #include "ui/gl/gl_switches.h" |
40 #include "ui/keyboard/keyboard_switches.h" | 41 #include "ui/keyboard/keyboard_switches.h" |
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
921 kOsCrOS, | 922 kOsCrOS, |
922 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick) | 923 SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick) |
923 }, | 924 }, |
924 { | 925 { |
925 "disable-easy-signin", | 926 "disable-easy-signin", |
926 IDS_FLAGS_DISABLE_EASY_SIGNIN_NAME, | 927 IDS_FLAGS_DISABLE_EASY_SIGNIN_NAME, |
927 IDS_FLAGS_DISABLE_EASY_SIGNIN_DESCRIPTION, | 928 IDS_FLAGS_DISABLE_EASY_SIGNIN_DESCRIPTION, |
928 kOsCrOSOwnerOnly, | 929 kOsCrOSOwnerOnly, |
929 SINGLE_VALUE_TYPE(chromeos::switches::kDisableEasySignin), | 930 SINGLE_VALUE_TYPE(chromeos::switches::kDisableEasySignin), |
930 }, | 931 }, |
| 932 { |
| 933 "enable-easy-unlock-proximity-detection", |
| 934 IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_NAME, |
| 935 IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION, |
| 936 kOsCrOS, |
| 937 SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection) |
| 938 }, |
931 #endif | 939 #endif |
932 #if defined(USE_ASH) | 940 #if defined(USE_ASH) |
933 { | 941 { |
934 "disable-minimize-on-second-launcher-item-click", | 942 "disable-minimize-on-second-launcher-item-click", |
935 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, | 943 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME, |
936 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, | 944 IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION, |
937 kOsAll, | 945 kOsAll, |
938 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) | 946 SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick) |
939 }, | 947 }, |
940 { | 948 { |
(...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2003 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_DESCRIPTION, | 2011 IDS_FLAGS_ENABLE_REMOTE_ASSISTANCE_DESCRIPTION, |
2004 kOsCrOS, | 2012 kOsCrOS, |
2005 SINGLE_VALUE_TYPE(extensions::switches::kEnableRemoteAssistance) | 2013 SINGLE_VALUE_TYPE(extensions::switches::kEnableRemoteAssistance) |
2006 }, | 2014 }, |
2007 { | 2015 { |
2008 "disable-new-zip-unpacker", | 2016 "disable-new-zip-unpacker", |
2009 IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_NAME, | 2017 IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_NAME, |
2010 IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_DESCRIPTION, | 2018 IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_DESCRIPTION, |
2011 kOsCrOS, | 2019 kOsCrOS, |
2012 SINGLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker) | 2020 SINGLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker) |
2013 } | 2021 }, |
2014 #endif // defined(OS_CHROMEOS) | 2022 #endif // defined(OS_CHROMEOS) |
2015 // NOTE: Adding new command-line switches requires adding corresponding | 2023 // NOTE: Adding new command-line switches requires adding corresponding |
2016 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2024 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2017 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2025 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2018 }; | 2026 }; |
2019 | 2027 |
2020 const Experiment* experiments = kExperiments; | 2028 const Experiment* experiments = kExperiments; |
2021 size_t num_experiments = arraysize(kExperiments); | 2029 size_t num_experiments = arraysize(kExperiments); |
2022 | 2030 |
2023 // Stores and encapsulates the little state that about:flags has. | 2031 // Stores and encapsulates the little state that about:flags has. |
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2590 } | 2598 } |
2591 | 2599 |
2592 const Experiment* GetExperiments(size_t* count) { | 2600 const Experiment* GetExperiments(size_t* count) { |
2593 *count = num_experiments; | 2601 *count = num_experiments; |
2594 return experiments; | 2602 return experiments; |
2595 } | 2603 } |
2596 | 2604 |
2597 } // namespace testing | 2605 } // namespace testing |
2598 | 2606 |
2599 } // namespace about_flags | 2607 } // namespace about_flags |
OLD | NEW |