| 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 <iterator> | 7 #include <iterator> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 2236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2247 }, | 2247 }, |
| 2248 #if defined(OS_CHROMEOS) | 2248 #if defined(OS_CHROMEOS) |
| 2249 { | 2249 { |
| 2250 "enable-firewall-hole-punching", | 2250 "enable-firewall-hole-punching", |
| 2251 IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_NAME, | 2251 IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_NAME, |
| 2252 IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_DESCRIPTION, | 2252 IDS_FLAGS_ENABLE_FIREWALL_HOLE_PUNCHING_DESCRIPTION, |
| 2253 kOsCrOS, | 2253 kOsCrOS, |
| 2254 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirewallHolePunching) | 2254 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirewallHolePunching) |
| 2255 }, | 2255 }, |
| 2256 #endif // defined(OS_CHROMEOS) | 2256 #endif // defined(OS_CHROMEOS) |
| 2257 { |
| 2258 "enable-webvr", |
| 2259 IDS_FLAGS_ENABLE_WEBVR_NAME, |
| 2260 IDS_FLAGS_ENABLE_WEBVR_DESCRIPTION, |
| 2261 kOsAll, |
| 2262 SINGLE_VALUE_TYPE(switches::kEnableWebVR) |
| 2263 }, |
| 2257 | 2264 |
| 2258 // NOTE: Adding new command-line switches requires adding corresponding | 2265 // NOTE: Adding new command-line switches requires adding corresponding |
| 2259 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2266 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
| 2260 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2267 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
| 2261 }; | 2268 }; |
| 2262 | 2269 |
| 2263 const Experiment* experiments = kExperiments; | 2270 const Experiment* experiments = kExperiments; |
| 2264 size_t num_experiments = arraysize(kExperiments); | 2271 size_t num_experiments = arraysize(kExperiments); |
| 2265 | 2272 |
| 2266 // Stores and encapsulates the little state that about:flags has. | 2273 // Stores and encapsulates the little state that about:flags has. |
| (...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2836 } | 2843 } |
| 2837 | 2844 |
| 2838 const Experiment* GetExperiments(size_t* count) { | 2845 const Experiment* GetExperiments(size_t* count) { |
| 2839 *count = num_experiments; | 2846 *count = num_experiments; |
| 2840 return experiments; | 2847 return experiments; |
| 2841 } | 2848 } |
| 2842 | 2849 |
| 2843 } // namespace testing | 2850 } // namespace testing |
| 2844 | 2851 |
| 2845 } // namespace about_flags | 2852 } // namespace about_flags |
| OLD | NEW |