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 2071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2082 IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, | 2082 IDS_FLAGS_USE_ANDROID_MIDI_API_DESCRIPTION, |
2083 kOsAndroid, | 2083 kOsAndroid, |
2084 SINGLE_VALUE_TYPE(switches::kUseAndroidMidiApi)}, | 2084 SINGLE_VALUE_TYPE(switches::kUseAndroidMidiApi)}, |
2085 #endif // defined(OS_ANDROID) | 2085 #endif // defined(OS_ANDROID) |
2086 #if defined(OS_WIN) | 2086 #if defined(OS_WIN) |
2087 {"trace-export-events-to-etw", | 2087 {"trace-export-events-to-etw", |
2088 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, | 2088 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_NAME, |
2089 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, | 2089 IDS_FLAGS_TRACE_EXPORT_EVENTS_TO_ETW_DESRIPTION, |
2090 kOsWin, | 2090 kOsWin, |
2091 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)}, | 2091 SINGLE_VALUE_TYPE(switches::kTraceExportEventsToETW)}, |
| 2092 {"merge-key-char-events", |
| 2093 IDS_FLAGS_MERGE_KEY_CHAR_EVENTS_NAME, |
| 2094 IDS_FLAGS_MERGE_KEY_CHAR_EVENTS_DESCRIPTION, |
| 2095 kOsWin, |
| 2096 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMergeKeyCharEvents, |
| 2097 switches::kDisableMergeKeyCharEvents)}, |
2092 #endif // defined(OS_WIN) | 2098 #endif // defined(OS_WIN) |
2093 #if defined(ENABLE_BACKGROUND) | 2099 #if defined(ENABLE_BACKGROUND) |
2094 {"enable-push-api-background-mode", | 2100 {"enable-push-api-background-mode", |
2095 IDS_FLAGS_ENABLE_PUSH_API_BACKGROUND_MODE_NAME, | 2101 IDS_FLAGS_ENABLE_PUSH_API_BACKGROUND_MODE_NAME, |
2096 IDS_FLAGS_ENABLE_PUSH_API_BACKGROUND_MODE_DESCRIPTION, | 2102 IDS_FLAGS_ENABLE_PUSH_API_BACKGROUND_MODE_DESCRIPTION, |
2097 kOsMac | kOsWin | kOsLinux, | 2103 kOsMac | kOsWin | kOsLinux, |
2098 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePushApiBackgroundMode, | 2104 ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePushApiBackgroundMode, |
2099 switches::kDisablePushApiBackgroundMode)}, | 2105 switches::kDisablePushApiBackgroundMode)}, |
2100 #endif // defined(ENABLE_BACKGROUND) | 2106 #endif // defined(ENABLE_BACKGROUND) |
2101 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 2107 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2760 } | 2766 } |
2761 | 2767 |
2762 const Experiment* GetExperiments(size_t* count) { | 2768 const Experiment* GetExperiments(size_t* count) { |
2763 *count = num_experiments; | 2769 *count = num_experiments; |
2764 return experiments; | 2770 return experiments; |
2765 } | 2771 } |
2766 | 2772 |
2767 } // namespace testing | 2773 } // namespace testing |
2768 | 2774 |
2769 } // namespace about_flags | 2775 } // namespace about_flags |
OLD | NEW |