| 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 <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1201 }, | 1201 }, |
| 1202 #endif | 1202 #endif |
| 1203 #endif | 1203 #endif |
| 1204 #if defined(OS_CHROMEOS) | 1204 #if defined(OS_CHROMEOS) |
| 1205 { "use-new-network-configuration-handlers", | 1205 { "use-new-network-configuration-handlers", |
| 1206 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_NAME, | 1206 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_NAME, |
| 1207 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_DESCRIPTION, | 1207 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_DESCRIPTION, |
| 1208 kOsCrOS, | 1208 kOsCrOS, |
| 1209 SINGLE_VALUE_TYPE(chromeos::switches::kUseNewNetworkConfigurationHandlers), | 1209 SINGLE_VALUE_TYPE(chromeos::switches::kUseNewNetworkConfigurationHandlers), |
| 1210 }, | 1210 }, |
| 1211 { "use-new-network-connection-handler", | |
| 1212 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONNECTION_HANDLER_NAME, | |
| 1213 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONNECTION_HANDLER_DESCRIPTION, | |
| 1214 kOsCrOS, | |
| 1215 SINGLE_VALUE_TYPE(chromeos::switches::kUseNewNetworkConnectionHandler), | |
| 1216 }, | |
| 1217 { | 1211 { |
| 1218 "ash-audio-device-menu", | 1212 "ash-audio-device-menu", |
| 1219 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME, | 1213 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME, |
| 1220 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_DESCRIPTION, | 1214 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_DESCRIPTION, |
| 1221 kOsCrOS, | 1215 kOsCrOS, |
| 1222 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableAudioDeviceMenu, | 1216 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableAudioDeviceMenu, |
| 1223 ash::switches::kAshDisableAudioDeviceMenu) | 1217 ash::switches::kAshDisableAudioDeviceMenu) |
| 1224 }, | 1218 }, |
| 1225 { | 1219 { |
| 1226 "enable-carrier-switching", | 1220 "enable-carrier-switching", |
| (...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2126 } | 2120 } |
| 2127 | 2121 |
| 2128 const Experiment* GetExperiments(size_t* count) { | 2122 const Experiment* GetExperiments(size_t* count) { |
| 2129 *count = num_experiments; | 2123 *count = num_experiments; |
| 2130 return experiments; | 2124 return experiments; |
| 2131 } | 2125 } |
| 2132 | 2126 |
| 2133 } // namespace testing | 2127 } // namespace testing |
| 2134 | 2128 |
| 2135 } // namespace about_flags | 2129 } // namespace about_flags |
| OLD | NEW |