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 2734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2745 flag_descriptions::kColorCorrectRenderingName, | 2745 flag_descriptions::kColorCorrectRenderingName, |
2746 flag_descriptions::kColorCorrectRenderingDescription, kOsAll, | 2746 flag_descriptions::kColorCorrectRenderingDescription, kOsAll, |
2747 MULTI_VALUE_TYPE(kColorCorrectRenderingChoices)}, | 2747 MULTI_VALUE_TYPE(kColorCorrectRenderingChoices)}, |
2748 | 2748 |
2749 #if defined(OS_CHROMEOS) | 2749 #if defined(OS_CHROMEOS) |
2750 {"quick-unlock-pin-signin", flag_descriptions::kQuickUnlockPinSignin, | 2750 {"quick-unlock-pin-signin", flag_descriptions::kQuickUnlockPinSignin, |
2751 flag_descriptions::kQuickUnlockPinSigninDescription, kOsCrOS, | 2751 flag_descriptions::kQuickUnlockPinSigninDescription, kOsCrOS, |
2752 FEATURE_VALUE_TYPE(features::kQuickUnlockPinSignin)}, | 2752 FEATURE_VALUE_TYPE(features::kQuickUnlockPinSignin)}, |
2753 #endif // OS_CHROMEOS | 2753 #endif // OS_CHROMEOS |
2754 | 2754 |
| 2755 #if defined(OS_ANDROID) |
| 2756 {"enable-webnfc", flag_descriptions::kEnableWebNfcName, |
| 2757 flag_descriptions::kEnableWebNfcDescription, kOsAndroid, |
| 2758 FEATURE_VALUE_TYPE(features::kWebNfc)}, |
| 2759 #endif |
| 2760 |
2755 // NOTE: Adding new command-line switches requires adding corresponding | 2761 // NOTE: Adding new command-line switches requires adding corresponding |
2756 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2762 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2757 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2763 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2758 }; | 2764 }; |
2759 | 2765 |
2760 class FlagsStateSingleton { | 2766 class FlagsStateSingleton { |
2761 public: | 2767 public: |
2762 FlagsStateSingleton() | 2768 FlagsStateSingleton() |
2763 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2769 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2764 ~FlagsStateSingleton() {} | 2770 ~FlagsStateSingleton() {} |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2961 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2967 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2962 | 2968 |
2963 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2969 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2964 *count = arraysize(kFeatureEntries); | 2970 *count = arraysize(kFeatureEntries); |
2965 return kFeatureEntries; | 2971 return kFeatureEntries; |
2966 } | 2972 } |
2967 | 2973 |
2968 } // namespace testing | 2974 } // namespace testing |
2969 | 2975 |
2970 } // namespace about_flags | 2976 } // namespace about_flags |
OLD | NEW |