| 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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 kOsWin, | 269 kOsWin, |
| 270 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu) | 270 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu) |
| 271 }, | 271 }, |
| 272 { | 272 { |
| 273 "ppapi-flash-in-process", | 273 "ppapi-flash-in-process", |
| 274 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME, | 274 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME, |
| 275 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION, | 275 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION, |
| 276 kOsAll, | 276 kOsAll, |
| 277 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess) | 277 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess) |
| 278 }, | 278 }, |
| 279 #if defined(TOOLKIT_GTK) | |
| 280 { | |
| 281 "global-gnome-menu", | |
| 282 IDS_FLAGS_LINUX_GLOBAL_MENUBAR_NAME, | |
| 283 IDS_FLAGS_LINUX_GLOBAL_MENUBAR_DESCRIPTION, | |
| 284 kOsLinux, | |
| 285 SINGLE_VALUE_TYPE(switches::kGlobalGnomeMenu) | |
| 286 }, | |
| 287 #endif | |
| 288 { | 279 { |
| 289 "enable-vpn", | 280 "enable-vpn", |
| 290 IDS_FLAGS_ENABLE_VPN_NAME, | 281 IDS_FLAGS_ENABLE_VPN_NAME, |
| 291 IDS_FLAGS_ENABLE_VPN_DESCRIPTION, | 282 IDS_FLAGS_ENABLE_VPN_DESCRIPTION, |
| 292 kOsCrOS, | 283 kOsCrOS, |
| 293 #if defined(OS_CHROMEOS) | 284 #if defined(OS_CHROMEOS) |
| 294 // The switch exists only on Chrome OS. | 285 // The switch exists only on Chrome OS. |
| 295 SINGLE_VALUE_TYPE(switches::kEnableVPN) | 286 SINGLE_VALUE_TYPE(switches::kEnableVPN) |
| 296 #else | 287 #else |
| 297 SINGLE_VALUE_TYPE("") | 288 SINGLE_VALUE_TYPE("") |
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 733 } | 724 } |
| 734 | 725 |
| 735 const Experiment* GetExperiments(size_t* count) { | 726 const Experiment* GetExperiments(size_t* count) { |
| 736 *count = num_experiments; | 727 *count = num_experiments; |
| 737 return experiments; | 728 return experiments; |
| 738 } | 729 } |
| 739 | 730 |
| 740 } // namespace testing | 731 } // namespace testing |
| 741 | 732 |
| 742 } // namespace about_flags | 733 } // namespace about_flags |
| OLD | NEW |