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 2108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2119 kOsAndroid, | 2119 kOsAndroid, |
2120 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, | 2120 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, |
2121 switches::kDisableNTPPopularSites)}, | 2121 switches::kDisableNTPPopularSites)}, |
2122 #endif // defined(OS_ANDROID) | 2122 #endif // defined(OS_ANDROID) |
2123 #if defined(OS_WIN) | 2123 #if defined(OS_WIN) |
2124 {"trace-export-events-to-etw", | 2124 {"trace-export-events-to-etw", |
2125 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, | 2125 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, |
2126 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, | 2126 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, |
2127 kOsWin, | 2127 kOsWin, |
2128 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)}, | 2128 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)}, |
| 2129 {"merge-key-char-events", |
| 2130 IDS_FLAGS_MERGE_KEY_CHAR_EVENTS_NAME, |
| 2131 IDS_FLAGS_MERGE_KEY_CHAR_EVENTS_DESCRIPTION, |
| 2132 kOsWin, |
| 2133 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMergeKeyCharEvents, |
| 2134 switches::kDisableMergeKeyCharEvents)}, |
2129 #endif // defined(OS_WIN) | 2135 #endif // defined(OS_WIN) |
2130 // NOTE: Adding new command-line switches requires adding corresponding | 2136 // NOTE: Adding new command-line switches requires adding corresponding |
2131 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2137 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2132 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2138 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2133 }; | 2139 }; |
2134 | 2140 |
2135 const Experiment* experiments = kExperiments; | 2141 const Experiment* experiments = kExperiments; |
2136 size_t num_experiments = arraysize(kExperiments); | 2142 size_t num_experiments = arraysize(kExperiments); |
2137 | 2143 |
2138 // Stores and encapsulates the little state that about:flags has. | 2144 // Stores and encapsulates the little state that about:flags has. |
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2762 } | 2768 } |
2763 | 2769 |
2764 const Experiment* GetExperiments(size_t* count) { | 2770 const Experiment* GetExperiments(size_t* count) { |
2765 *count = num_experiments; | 2771 *count = num_experiments; |
2766 return experiments; | 2772 return experiments; |
2767 } | 2773 } |
2768 | 2774 |
2769 } // namespace testing | 2775 } // namespace testing |
2770 | 2776 |
2771 } // namespace about_flags | 2777 } // namespace about_flags |
OLD | NEW |