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 2242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 { | 2257 { |
2258 "enable-media-router", | 2258 "enable-media-router", |
2259 IDS_FLAGS_ENABLE_MEDIA_ROUTER_NAME, | 2259 IDS_FLAGS_ENABLE_MEDIA_ROUTER_NAME, |
2260 IDS_FLAGS_ENABLE_MEDIA_ROUTER_DESCRIPTION, | 2260 IDS_FLAGS_ENABLE_MEDIA_ROUTER_DESCRIPTION, |
2261 kOsAll, | 2261 kOsAll, |
2262 SINGLE_VALUE_TYPE(switches::kEnableMediaRouter) | 2262 SINGLE_VALUE_TYPE(switches::kEnableMediaRouter) |
2263 } | 2263 }, |
| 2264 { |
| 2265 "enable-webvr", |
| 2266 IDS_FLAGS_ENABLE_WEBVR_NAME, |
| 2267 IDS_FLAGS_ENABLE_WEBVR_DESCRIPTION, |
| 2268 kOsAll, |
| 2269 SINGLE_VALUE_TYPE(switches::kEnableWebVR) |
| 2270 }, |
2264 | 2271 |
2265 // NOTE: Adding new command-line switches requires adding corresponding | 2272 // NOTE: Adding new command-line switches requires adding corresponding |
2266 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2273 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2267 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2274 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2268 }; | 2275 }; |
2269 | 2276 |
2270 const Experiment* experiments = kExperiments; | 2277 const Experiment* experiments = kExperiments; |
2271 size_t num_experiments = arraysize(kExperiments); | 2278 size_t num_experiments = arraysize(kExperiments); |
2272 | 2279 |
2273 // Stores and encapsulates the little state that about:flags has. | 2280 // Stores and encapsulates the little state that about:flags has. |
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2843 } | 2850 } |
2844 | 2851 |
2845 const Experiment* GetExperiments(size_t* count) { | 2852 const Experiment* GetExperiments(size_t* count) { |
2846 *count = num_experiments; | 2853 *count = num_experiments; |
2847 return experiments; | 2854 return experiments; |
2848 } | 2855 } |
2849 | 2856 |
2850 } // namespace testing | 2857 } // namespace testing |
2851 | 2858 |
2852 } // namespace about_flags | 2859 } // namespace about_flags |
OLD | NEW |