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 975 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
986 kOsCrOS, | 986 kOsCrOS, |
987 SINGLE_VALUE_TYPE(switches::kEnableContacts) | 987 SINGLE_VALUE_TYPE(switches::kEnableContacts) |
988 }, | 988 }, |
989 #if defined(USE_ASH) | 989 #if defined(USE_ASH) |
990 { "ash-enable-advanced-gestures", | 990 { "ash-enable-advanced-gestures", |
991 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_NAME, | 991 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_NAME, |
992 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, | 992 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, |
993 kOsCrOS, | 993 kOsCrOS, |
994 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), | 994 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), |
995 }, | 995 }, |
| 996 #if defined(OS_LINUX) |
| 997 { "ash-enable-memory-monitor", |
| 998 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, |
| 999 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, |
| 1000 kOsCrOS, |
| 1001 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMemoryMonitor), |
| 1002 }, |
| 1003 #endif |
996 #endif | 1004 #endif |
997 #if defined(OS_CHROMEOS) | 1005 #if defined(OS_CHROMEOS) |
998 { | 1006 { |
999 "enable-carrier-switching", | 1007 "enable-carrier-switching", |
1000 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | 1008 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
1001 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | 1009 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
1002 kOsCrOS, | 1010 kOsCrOS, |
1003 SINGLE_VALUE_TYPE(switches::kEnableCarrierSwitching) | 1011 SINGLE_VALUE_TYPE(switches::kEnableCarrierSwitching) |
1004 }, | 1012 }, |
1005 { | 1013 { |
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1499 } | 1507 } |
1500 | 1508 |
1501 const Experiment* GetExperiments(size_t* count) { | 1509 const Experiment* GetExperiments(size_t* count) { |
1502 *count = num_experiments; | 1510 *count = num_experiments; |
1503 return experiments; | 1511 return experiments; |
1504 } | 1512 } |
1505 | 1513 |
1506 } // namespace testing | 1514 } // namespace testing |
1507 | 1515 |
1508 } // namespace about_flags | 1516 } // namespace about_flags |
OLD | NEW |