| 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 1160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1171 }, | 1171 }, |
| 1172 #endif | 1172 #endif |
| 1173 #endif | 1173 #endif |
| 1174 #if defined(OS_CHROMEOS) | 1174 #if defined(OS_CHROMEOS) |
| 1175 { "use-new-network-configuration-handlers", | 1175 { "use-new-network-configuration-handlers", |
| 1176 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_NAME, | 1176 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_NAME, |
| 1177 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_DESCRIPTION, | 1177 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_DESCRIPTION, |
| 1178 kOsCrOS, | 1178 kOsCrOS, |
| 1179 SINGLE_VALUE_TYPE(chromeos::switches::kUseNewNetworkConfigurationHandlers), | 1179 SINGLE_VALUE_TYPE(chromeos::switches::kUseNewNetworkConfigurationHandlers), |
| 1180 }, | 1180 }, |
| 1181 { "use-new-network-connection-handler", | |
| 1182 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONNECTION_HANDLER_NAME, | |
| 1183 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONNECTION_HANDLER_DESCRIPTION, | |
| 1184 kOsCrOS, | |
| 1185 SINGLE_VALUE_TYPE(chromeos::switches::kUseNewNetworkConnectionHandler), | |
| 1186 }, | |
| 1187 { | 1181 { |
| 1188 "ash-audio-device-menu", | 1182 "ash-audio-device-menu", |
| 1189 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME, | 1183 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME, |
| 1190 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_DESCRIPTION, | 1184 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_DESCRIPTION, |
| 1191 kOsCrOS, | 1185 kOsCrOS, |
| 1192 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableAudioDeviceMenu, | 1186 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableAudioDeviceMenu, |
| 1193 ash::switches::kAshDisableAudioDeviceMenu) | 1187 ash::switches::kAshDisableAudioDeviceMenu) |
| 1194 }, | 1188 }, |
| 1195 { | 1189 { |
| 1196 "enable-carrier-switching", | 1190 "enable-carrier-switching", |
| (...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2090 } | 2084 } |
| 2091 | 2085 |
| 2092 const Experiment* GetExperiments(size_t* count) { | 2086 const Experiment* GetExperiments(size_t* count) { |
| 2093 *count = num_experiments; | 2087 *count = num_experiments; |
| 2094 return experiments; | 2088 return experiments; |
| 2095 } | 2089 } |
| 2096 | 2090 |
| 2097 } // namespace testing | 2091 } // namespace testing |
| 2098 | 2092 |
| 2099 } // namespace about_flags | 2093 } // namespace about_flags |
| OLD | NEW |