| 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 kOsWin, | 283 kOsWin, |
| 284 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu) | 284 SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu) |
| 285 }, | 285 }, |
| 286 { | 286 { |
| 287 "ppapi-flash-in-process", | 287 "ppapi-flash-in-process", |
| 288 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME, | 288 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME, |
| 289 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION, | 289 IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION, |
| 290 kOsAll, | 290 kOsAll, |
| 291 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess) | 291 SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess) |
| 292 }, | 292 }, |
| 293 #if defined(TOOLKIT_GTK) | |
| 294 { | |
| 295 "global-gnome-menu", | |
| 296 IDS_FLAGS_LINUX_GLOBAL_MENUBAR_NAME, | |
| 297 IDS_FLAGS_LINUX_GLOBAL_MENUBAR_DESCRIPTION, | |
| 298 kOsLinux, | |
| 299 SINGLE_VALUE_TYPE(switches::kGlobalGnomeMenu) | |
| 300 }, | |
| 301 #endif | |
| 302 { | 293 { |
| 303 "enable-vpn", | 294 "enable-vpn", |
| 304 IDS_FLAGS_ENABLE_VPN_NAME, | 295 IDS_FLAGS_ENABLE_VPN_NAME, |
| 305 IDS_FLAGS_ENABLE_VPN_DESCRIPTION, | 296 IDS_FLAGS_ENABLE_VPN_DESCRIPTION, |
| 306 kOsCrOS, | 297 kOsCrOS, |
| 307 #if defined(OS_CHROMEOS) | 298 #if defined(OS_CHROMEOS) |
| 308 // The switch exists only on Chrome OS. | 299 // The switch exists only on Chrome OS. |
| 309 SINGLE_VALUE_TYPE(switches::kEnableVPN) | 300 SINGLE_VALUE_TYPE(switches::kEnableVPN) |
| 310 #else | 301 #else |
| 311 SINGLE_VALUE_TYPE("") | 302 SINGLE_VALUE_TYPE("") |
| (...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 } | 745 } |
| 755 | 746 |
| 756 const Experiment* GetExperiments(size_t* count) { | 747 const Experiment* GetExperiments(size_t* count) { |
| 757 *count = num_experiments; | 748 *count = num_experiments; |
| 758 return experiments; | 749 return experiments; |
| 759 } | 750 } |
| 760 | 751 |
| 761 } // namespace testing | 752 } // namespace testing |
| 762 | 753 |
| 763 } // namespace about_flags | 754 } // namespace about_flags |
| OLD | NEW |