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 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1179 }, | 1179 }, |
1180 #endif | 1180 #endif |
1181 #endif | 1181 #endif |
1182 #if defined(OS_CHROMEOS) | 1182 #if defined(OS_CHROMEOS) |
1183 { "use-new-network-configuration-handlers", | 1183 { "use-new-network-configuration-handlers", |
1184 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_NAME, | 1184 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_NAME, |
1185 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_DESCRIPTION, | 1185 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONFIGURATION_HANDLERS_DESCRIPTION, |
1186 kOsCrOS, | 1186 kOsCrOS, |
1187 SINGLE_VALUE_TYPE(chromeos::switches::kUseNewNetworkConfigurationHandlers), | 1187 SINGLE_VALUE_TYPE(chromeos::switches::kUseNewNetworkConfigurationHandlers), |
1188 }, | 1188 }, |
1189 { "use-new-network-connection-handler", | |
1190 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONNECTION_HANDLER_NAME, | |
1191 IDS_FLAGS_CHROMEOS_USE_NEW_NETWORK_CONNECTION_HANDLER_DESCRIPTION, | |
1192 kOsCrOS, | |
1193 SINGLE_VALUE_TYPE(chromeos::switches::kUseNewNetworkConnectionHandler), | |
1194 }, | |
1195 { | 1189 { |
1196 "ash-audio-device-menu", | 1190 "ash-audio-device-menu", |
1197 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME, | 1191 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_NAME, |
1198 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_DESCRIPTION, | 1192 IDS_FLAGS_ASH_AUDIO_DEVICE_MENU_DESCRIPTION, |
1199 kOsCrOS, | 1193 kOsCrOS, |
1200 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableAudioDeviceMenu, | 1194 ENABLE_DISABLE_VALUE_TYPE(ash::switches::kAshEnableAudioDeviceMenu, |
1201 ash::switches::kAshDisableAudioDeviceMenu) | 1195 ash::switches::kAshDisableAudioDeviceMenu) |
1202 }, | 1196 }, |
1203 { | 1197 { |
1204 "enable-carrier-switching", | 1198 "enable-carrier-switching", |
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2114 } | 2108 } |
2115 | 2109 |
2116 const Experiment* GetExperiments(size_t* count) { | 2110 const Experiment* GetExperiments(size_t* count) { |
2117 *count = num_experiments; | 2111 *count = num_experiments; |
2118 return experiments; | 2112 return experiments; |
2119 } | 2113 } |
2120 | 2114 |
2121 } // namespace testing | 2115 } // namespace testing |
2122 | 2116 |
2123 } // namespace about_flags | 2117 } // namespace about_flags |
OLD | NEW |