Chromium Code Reviews| 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 2131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2142 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures) | 2142 SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures) |
| 2143 }, | 2143 }, |
| 2144 #endif | 2144 #endif |
| 2145 { | 2145 { |
| 2146 "enable-delay-agnostic-aec", | 2146 "enable-delay-agnostic-aec", |
| 2147 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_NAME, | 2147 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_NAME, |
| 2148 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_DESCRIPTION, | 2148 IDS_FLAGS_ENABLE_DELAY_AGNOSTIC_AEC_DESCRIPTION, |
| 2149 kOsDesktop, | 2149 kOsDesktop, |
| 2150 SINGLE_VALUE_TYPE(switches::kEnableDelayAgnosticAec) | 2150 SINGLE_VALUE_TYPE(switches::kEnableDelayAgnosticAec) |
| 2151 }, | 2151 }, |
| 2152 | |
|
oshima
2015/01/24 04:55:47
nit: revert this change?
afakhry
2015/01/27 17:44:13
Done.
| |
| 2153 { | 2152 { |
| 2154 "mark-non-secure-as", // FLAGS:RECORD_UMA | 2153 "mark-non-secure-as", // FLAGS:RECORD_UMA |
| 2155 IDS_MARK_NON_SECURE_AS_NAME, | 2154 IDS_MARK_NON_SECURE_AS_NAME, |
| 2156 IDS_MARK_NON_SECURE_AS_DESCRIPTION, | 2155 IDS_MARK_NON_SECURE_AS_DESCRIPTION, |
| 2157 kOsAll, | 2156 kOsAll, |
| 2158 MULTI_VALUE_TYPE(kMarkNonSecureAsChoices) | 2157 MULTI_VALUE_TYPE(kMarkNonSecureAsChoices) |
| 2159 }, | 2158 }, |
| 2160 | 2159 |
| 2161 // NOTE: Adding new command-line switches requires adding corresponding | 2160 // NOTE: Adding new command-line switches requires adding corresponding |
| 2162 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2161 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| (...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2729 } | 2728 } |
| 2730 | 2729 |
| 2731 const Experiment* GetExperiments(size_t* count) { | 2730 const Experiment* GetExperiments(size_t* count) { |
| 2732 *count = num_experiments; | 2731 *count = num_experiments; |
| 2733 return experiments; | 2732 return experiments; |
| 2734 } | 2733 } |
| 2735 | 2734 |
| 2736 } // namespace testing | 2735 } // namespace testing |
| 2737 | 2736 |
| 2738 } // namespace about_flags | 2737 } // namespace about_flags |
| OLD | NEW |