| 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 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1116 #if defined(OS_LINUX) | 1116 #if defined(OS_LINUX) |
| 1117 { "ash-enable-memory-monitor", | 1117 { "ash-enable-memory-monitor", |
| 1118 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, | 1118 IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME, |
| 1119 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, | 1119 IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION, |
| 1120 kOsCrOS, | 1120 kOsCrOS, |
| 1121 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMemoryMonitor), | 1121 SINGLE_VALUE_TYPE(ash::switches::kAshEnableMemoryMonitor), |
| 1122 }, | 1122 }, |
| 1123 #endif | 1123 #endif |
| 1124 #endif | 1124 #endif |
| 1125 #if defined(OS_CHROMEOS) | 1125 #if defined(OS_CHROMEOS) |
| 1126 { "ash-enable-new-network-status-area", | 1126 { "ash-disable-new-network-status-area", |
| 1127 IDS_FLAGS_ASH_ENABLE_NEW_NETWORK_STATUS_AREA_NAME, | 1127 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_NAME, |
| 1128 IDS_FLAGS_ASH_ENABLE_NEW_NETWORK_STATUS_AREA_DESCRIPTION, | 1128 IDS_FLAGS_ASH_DISABLE_NEW_NETWORK_STATUS_AREA_DESCRIPTION, |
| 1129 kOsCrOS, | 1129 kOsCrOS, |
| 1130 SINGLE_VALUE_TYPE(ash::switches::kAshEnableNewNetworkStatusArea), | 1130 SINGLE_VALUE_TYPE(ash::switches::kAshDisableNewNetworkStatusArea), |
| 1131 }, | 1131 }, |
| 1132 { | 1132 { |
| 1133 "enable-carrier-switching", | 1133 "enable-carrier-switching", |
| 1134 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, | 1134 IDS_FLAGS_ENABLE_CARRIER_SWITCHING, |
| 1135 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, | 1135 IDS_FLAGS_ENABLE_CARRIER_SWITCHING_DESCRIPTION, |
| 1136 kOsCrOS, | 1136 kOsCrOS, |
| 1137 SINGLE_VALUE_TYPE(switches::kEnableCarrierSwitching) | 1137 SINGLE_VALUE_TYPE(switches::kEnableCarrierSwitching) |
| 1138 }, | 1138 }, |
| 1139 { | 1139 { |
| 1140 "enable-request-tablet-site", | 1140 "enable-request-tablet-site", |
| (...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1772 } | 1772 } |
| 1773 | 1773 |
| 1774 const Experiment* GetExperiments(size_t* count) { | 1774 const Experiment* GetExperiments(size_t* count) { |
| 1775 *count = num_experiments; | 1775 *count = num_experiments; |
| 1776 return experiments; | 1776 return experiments; |
| 1777 } | 1777 } |
| 1778 | 1778 |
| 1779 } // namespace testing | 1779 } // namespace testing |
| 1780 | 1780 |
| 1781 } // namespace about_flags | 1781 } // namespace about_flags |
| OLD | NEW |