| 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 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1174 #endif | 1174 #endif |
| 1175 #endif | 1175 #endif |
| 1176 #if defined(OS_CHROMEOS) | 1176 #if defined(OS_CHROMEOS) |
| 1177 { "ash-disable-new-network-status-area", | 1177 { "ash-disable-new-network-status-area", |
| 1178 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_NAME, | 1178 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_NAME, |
| 1179 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_DESCRIPTION, | 1179 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_DESCRIPTION, |
| 1180 kOsCrOS, | 1180 kOsCrOS, |
| 1181 SINGLE_VALUE_TYPE(ash::switches::kAshDisableNewNetworkStatusArea), | 1181 SINGLE_VALUE_TYPE(ash::switches::kAshDisableNewNetworkStatusArea), |
| 1182 }, | 1182 }, |
| 1183 { | 1183 { |
| 1184 "ash-enable-new-audio-handler", | 1184 "ash-enable-new-audio-handler2", |
| 1185 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_NAME, | 1185 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_NAME, |
| 1186 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_DESCRIPTION, | 1186 IDS_FLAGS_ASH_ENABLE_NEW_AUDIO_HANDLER_DESCRIPTION, |
| 1187 kOsCrOS, | 1187 kOsCrOS, |
| 1188 SINGLE_VALUE_TYPE(ash::switches::kAshEnableNewAudioHandler) | 1188 ENABLE_DISABLE_VALUE_TYPE("", ash::switches::kAshDisableNewAudioHandler) |
| 1189 }, | 1189 }, |
| 1190 { | 1190 { |
| 1191 "enable-carrier-switching", | 1191 "enable-carrier-switching", |
| 1192 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | 1192 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
| 1193 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | 1193 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
| 1194 kOsCrOS, | 1194 kOsCrOS, |
| 1195 SINGLE_VALUE_TYPE(switches::kEnableCarrierSwitching) | 1195 SINGLE_VALUE_TYPE(switches::kEnableCarrierSwitching) |
| 1196 }, | 1196 }, |
| 1197 { | 1197 { |
| 1198 "enable-request-tablet-site", | 1198 "enable-request-tablet-site", |
| (...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1934 } | 1934 } |
| 1935 | 1935 |
| 1936 const Experiment* GetExperiments(size_t* count) { | 1936 const Experiment* GetExperiments(size_t* count) { |
| 1937 *count = num_experiments; | 1937 *count = num_experiments; |
| 1938 return experiments; | 1938 return experiments; |
| 1939 } | 1939 } |
| 1940 | 1940 |
| 1941 } // namespace testing | 1941 } // namespace testing |
| 1942 | 1942 |
| 1943 } // namespace about_flags | 1943 } // namespace about_flags |
| OLD | NEW |