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 2119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2130 // merge the flag values. | 2130 // merge the flag values. |
2131 SINGLE_VALUE_TYPE_AND_VALUE( | 2131 SINGLE_VALUE_TYPE_AND_VALUE( |
2132 switches::kBlinkSettings, "lowPriorityIframes=true")}, | 2132 switches::kBlinkSettings, "lowPriorityIframes=true")}, |
2133 #if defined(OS_ANDROID) | 2133 #if defined(OS_ANDROID) |
2134 {"enable-ntp-popular-sites", | 2134 {"enable-ntp-popular-sites", |
2135 IDS_FLAGS_NTP_POPULAR_SITES_NAME, | 2135 IDS_FLAGS_NTP_POPULAR_SITES_NAME, |
2136 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, | 2136 IDS_FLAGS_NTP_POPULAR_SITES_DESCRIPTION, |
2137 kOsAndroid, | 2137 kOsAndroid, |
2138 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, | 2138 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNTPPopularSites, |
2139 switches::kDisableNTPPopularSites)}, | 2139 switches::kDisableNTPPopularSites)}, |
| 2140 {"use-android-midi-api", |
| 2141 IDS_FLAGS_USE_ANDROID_MIDI_API_NAME, |
| 2142 IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, |
| 2143 kOsAndroid, |
| 2144 SINGLE_VALUE_TYPE(switches::kUseAndroidMidiApi)}, |
2140 #endif // defined(OS_ANDROID) | 2145 #endif // defined(OS_ANDROID) |
2141 #if defined(OS_WIN) | 2146 #if defined(OS_WIN) |
2142 {"trace-export-events-to-etw", | 2147 {"trace-export-events-to-etw", |
2143 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, | 2148 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, |
2144 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, | 2149 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, |
2145 kOsWin, | 2150 kOsWin, |
2146 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)}, | 2151 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)}, |
2147 #endif // defined(OS_WIN) | 2152 #endif // defined(OS_WIN) |
2148 // NOTE: Adding new command-line switches requires adding corresponding | 2153 // NOTE: Adding new command-line switches requires adding corresponding |
2149 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2154 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2780 } | 2785 } |
2781 | 2786 |
2782 const Experiment* GetExperiments(size_t* count) { | 2787 const Experiment* GetExperiments(size_t* count) { |
2783 *count = num_experiments; | 2788 *count = num_experiments; |
2784 return experiments; | 2789 return experiments; |
2785 } | 2790 } |
2786 | 2791 |
2787 } // namespace testing | 2792 } // namespace testing |
2788 | 2793 |
2789 } // namespace about_flags | 2794 } // namespace about_flags |
OLD | NEW |