| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu) | 288 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu) |
| 289 }, | 289 }, |
| 290 { | 290 { |
| 291 "ppapi-flash-in-process", | 291 "ppapi-flash-in-process", |
| 292 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME, | 292 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME, |
| 293 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION, | 293 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION, |
| 294 kOsAll, | 294 kOsAll, |
| 295 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess) | 295 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess) |
| 296 }, | 296 }, |
| 297 { | 297 { |
| 298 "enable-vpn", | |
| 299 IDS_FLAGS_ENABLE_VPN_NAME, | |
| 300 IDS_FLAGS_ENABLE_VPN_DESCRIPTION, | |
| 301 kOsCrOS, | |
| 302 #if defined(OS_CHROMEOS) | |
| 303 // The switch exists only on Chrome OS. | |
| 304 SINGLE_VALUE_TYPE(switches::kEnableVPN) | |
| 305 #else | |
| 306 SINGLE_VALUE_TYPE("") | |
| 307 #endif | |
| 308 }, | |
| 309 { | |
| 310 "multi-profiles", | 298 "multi-profiles", |
| 311 IDS_FLAGS_MULTI_PROFILES_NAME, | 299 IDS_FLAGS_MULTI_PROFILES_NAME, |
| 312 IDS_FLAGS_MULTI_PROFILES_DESCRIPTION, | 300 IDS_FLAGS_MULTI_PROFILES_DESCRIPTION, |
| 313 kOsAll, | 301 kOsAll, |
| 314 SINGLE_VALUE_TYPE(switches::kMultiProfiles) | 302 SINGLE_VALUE_TYPE(switches::kMultiProfiles) |
| 315 }, | 303 }, |
| 316 { | 304 { |
| 317 "restrict-instant-to-search", | 305 "restrict-instant-to-search", |
| 318 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_NAME, | 306 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_NAME, |
| 319 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_DESCRIPTION, | 307 IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_DESCRIPTION, |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 760 } | 748 } |
| 761 | 749 |
| 762 const Experiment* GetExperiments(size_t* count) { | 750 const Experiment* GetExperiments(size_t* count) { |
| 763 *count = num_experiments; | 751 *count = num_experiments; |
| 764 return experiments; | 752 return experiments; |
| 765 } | 753 } |
| 766 | 754 |
| 767 } // namespace testing | 755 } // namespace testing |
| 768 | 756 |
| 769 } // namespace about_flags | 757 } // namespace about_flags |
| OLD | NEW |