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 2712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2723 {"enable-copyless-paste", flag_descriptions::kEnableCopylessPasteName, | 2723 {"enable-copyless-paste", flag_descriptions::kEnableCopylessPasteName, |
2724 flag_descriptions::kEnableCopylessPasteDescription, kOsAndroid, | 2724 flag_descriptions::kEnableCopylessPasteDescription, kOsAndroid, |
2725 FEATURE_VALUE_TYPE(features::kCopylessPaste)}, | 2725 FEATURE_VALUE_TYPE(features::kCopylessPaste)}, |
2726 #endif | 2726 #endif |
2727 | 2727 |
2728 {"enable-color-correct-rendering", | 2728 {"enable-color-correct-rendering", |
2729 flag_descriptions::kColorCorrectRenderingName, | 2729 flag_descriptions::kColorCorrectRenderingName, |
2730 flag_descriptions::kColorCorrectRenderingDescription, kOsAll, | 2730 flag_descriptions::kColorCorrectRenderingDescription, kOsAll, |
2731 MULTI_VALUE_TYPE(kColorCorrectRenderingChoices)}, | 2731 MULTI_VALUE_TYPE(kColorCorrectRenderingChoices)}, |
2732 | 2732 |
| 2733 #if defined(OS_ANDROID) |
| 2734 {"enable-webnfc", flag_descriptions::kEnableWebNfcName, |
| 2735 flag_descriptions::kEnableWebNfcDescription, kOsAndroid, |
| 2736 FEATURE_VALUE_TYPE(features::kWebNfc)}, |
| 2737 #endif |
| 2738 |
2733 // NOTE: Adding new command-line switches requires adding corresponding | 2739 // NOTE: Adding new command-line switches requires adding corresponding |
2734 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2740 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2735 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2741 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2736 }; | 2742 }; |
2737 | 2743 |
2738 class FlagsStateSingleton { | 2744 class FlagsStateSingleton { |
2739 public: | 2745 public: |
2740 FlagsStateSingleton() | 2746 FlagsStateSingleton() |
2741 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} | 2747 : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {} |
2742 ~FlagsStateSingleton() {} | 2748 ~FlagsStateSingleton() {} |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2939 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2945 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2940 | 2946 |
2941 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2947 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2942 *count = arraysize(kFeatureEntries); | 2948 *count = arraysize(kFeatureEntries); |
2943 return kFeatureEntries; | 2949 return kFeatureEntries; |
2944 } | 2950 } |
2945 | 2951 |
2946 } // namespace testing | 2952 } // namespace testing |
2947 | 2953 |
2948 } // namespace about_flags | 2954 } // namespace about_flags |
OLD | NEW |