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 2118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2129 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures) | 2129 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures) |
2130 }, | 2130 }, |
2131 #endif | 2131 #endif |
2132 { | 2132 { |
2133 "enable-delay-agnostic-aec", | 2133 "enable-delay-agnostic-aec", |
2134 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_NAME, | 2134 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_NAME, |
2135 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_DESCRIPTION, | 2135 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_DESCRIPTION, |
2136 kOsDesktop, | 2136 kOsDesktop, |
2137 SINGLE_VALUE_TYPE(switches::kEnableDelayAgnosticAec) | 2137 SINGLE_VALUE_TYPE(switches::kEnableDelayAgnosticAec) |
2138 }, | 2138 }, |
| 2139 #if defined(OS_ANDROID) |
| 2140 { |
| 2141 "enable-cursor-anchor-info", |
| 2142 IDS_FLAGS_ENABLE_CURSOR_ANCHOR_INFO_NAME, |
| 2143 IDS_FLAGS_ENABLE_CURSOR_ANCHOR_INFO_DESCRIPTION, |
| 2144 kOsAndroid, |
| 2145 SINGLE_VALUE_TYPE(switches::kEnableCursorAnchorInfo) |
| 2146 }, |
| 2147 #endif |
2139 | 2148 |
2140 { | 2149 { |
2141 "mark-non-secure-as", // FLAGS:RECORD_UMA | 2150 "mark-non-secure-as", // FLAGS:RECORD_UMA |
2142 IDS_MARK_NON_SECURE_AS_NAME, | 2151 IDS_MARK_NON_SECURE_AS_NAME, |
2143 IDS_MARK_NON_SECURE_AS_DESCRIPTION, | 2152 IDS_MARK_NON_SECURE_AS_DESCRIPTION, |
2144 kOsAll, | 2153 kOsAll, |
2145 MULTI_VALUE_TYPE(kMarkNonSecureAsChoices) | 2154 MULTI_VALUE_TYPE(kMarkNonSecureAsChoices) |
2146 }, | 2155 }, |
2147 | 2156 |
2148 { | 2157 { |
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2733 } | 2742 } |
2734 | 2743 |
2735 const Experiment* GetExperiments(size_t* count) { | 2744 const Experiment* GetExperiments(size_t* count) { |
2736 *count = num_experiments; | 2745 *count = num_experiments; |
2737 return experiments; | 2746 return experiments; |
2738 } | 2747 } |
2739 | 2748 |
2740 } // namespace testing | 2749 } // namespace testing |
2741 | 2750 |
2742 } // namespace about_flags | 2751 } // namespace about_flags |
OLD | NEW |