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 951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
962 kOsCrOS, | 962 kOsCrOS, |
963 SINGLE_VALUE_TYPE(switches::kEnableContacts) | 963 SINGLE_VALUE_TYPE(switches::kEnableContacts) |
964 }, | 964 }, |
965 #if defined(USE_ASH) | 965 #if defined(USE_ASH) |
966 { "ash-enable-advanced-gestures", | 966 { "ash-enable-advanced-gestures", |
967 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_NAME, | 967 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_NAME, |
968 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, | 968 IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION, |
969 kOsCrOS, | 969 kOsCrOS, |
970 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), | 970 SINGLE_VALUE_TYPE(ash::switches::kAshEnableAdvancedGestures), |
971 }, | 971 }, |
| 972 { "ash-enable-memory-monitor", |
| 973 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, |
| 974 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, |
| 975 kOsCrOS, |
| 976 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMemoryMonitor), |
| 977 }, |
972 #endif | 978 #endif |
973 #if defined(OS_CHROMEOS) | 979 #if defined(OS_CHROMEOS) |
974 { | 980 { |
975 "enable-carrier-switching", | 981 "enable-carrier-switching", |
976 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | 982 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
977 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | 983 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
978 kOsCrOS, | 984 kOsCrOS, |
979 SINGLE_VALUE_TYPE(switches::kEnableCarrierSwitching) | 985 SINGLE_VALUE_TYPE(switches::kEnableCarrierSwitching) |
980 }, | 986 }, |
981 { | 987 { |
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1475 } | 1481 } |
1476 | 1482 |
1477 const Experiment* GetExperiments(size_t* count) { | 1483 const Experiment* GetExperiments(size_t* count) { |
1478 *count = num_experiments; | 1484 *count = num_experiments; |
1479 return experiments; | 1485 return experiments; |
1480 } | 1486 } |
1481 | 1487 |
1482 } // namespace testing | 1488 } // namespace testing |
1483 | 1489 |
1484 } // namespace about_flags | 1490 } // namespace about_flags |
OLD | NEW |