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 2450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2461 // Temporary flag to ease the transition to standard-compliant scrollTop | 2461 // Temporary flag to ease the transition to standard-compliant scrollTop |
2462 // behavior. Will be removed shortly after http://crbug.com/157855 ships. | 2462 // behavior. Will be removed shortly after http://crbug.com/157855 ships. |
2463 { | 2463 { |
2464 "scroll-top-left-interop", | 2464 "scroll-top-left-interop", |
2465 IDS_FLAGS_SCROLL_TOP_LEFT_INTEROP_NAME, | 2465 IDS_FLAGS_SCROLL_TOP_LEFT_INTEROP_NAME, |
2466 IDS_FLAGS_SCROLL_TOP_LEFT_INTEROP_DESCRIPTION, | 2466 IDS_FLAGS_SCROLL_TOP_LEFT_INTEROP_DESCRIPTION, |
2467 kOsAll, | 2467 kOsAll, |
2468 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( | 2468 ENABLE_DISABLE_VALUE_TYPE_AND_VALUE( |
2469 switches::kEnableBlinkFeatures, "ScrollTopLeftInterop", | 2469 switches::kEnableBlinkFeatures, "ScrollTopLeftInterop", |
2470 switches::kDisableBlinkFeatures, "ScrollTopLeftInterop") | 2470 switches::kDisableBlinkFeatures, "ScrollTopLeftInterop") |
2471 } | 2471 }, |
| 2472 { |
| 2473 "enable-webvr", |
| 2474 IDS_FLAGS_ENABLE_WEBVR_NAME, |
| 2475 IDS_FLAGS_ENABLE_WEBVR_DESCRIPTION, |
| 2476 kOsAll, |
| 2477 SINGLE_VALUE_TYPE(switches::kEnableWebVR) |
| 2478 }, |
| 2479 |
2472 // NOTE: Adding new command-line switches requires adding corresponding | 2480 // NOTE: Adding new command-line switches requires adding corresponding |
2473 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 2481 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
2474 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 2482 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
2475 }; | 2483 }; |
2476 | 2484 |
2477 const Experiment* experiments = kExperiments; | 2485 const Experiment* experiments = kExperiments; |
2478 size_t num_experiments = arraysize(kExperiments); | 2486 size_t num_experiments = arraysize(kExperiments); |
2479 | 2487 |
2480 // Stores and encapsulates the little state that about:flags has. | 2488 // Stores and encapsulates the little state that about:flags has. |
2481 class FlagsState { | 2489 class FlagsState { |
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3050 } | 3058 } |
3051 | 3059 |
3052 const Experiment* GetExperiments(size_t* count) { | 3060 const Experiment* GetExperiments(size_t* count) { |
3053 *count = num_experiments; | 3061 *count = num_experiments; |
3054 return experiments; | 3062 return experiments; |
3055 } | 3063 } |
3056 | 3064 |
3057 } // namespace testing | 3065 } // namespace testing |
3058 | 3066 |
3059 } // namespace about_flags | 3067 } // namespace about_flags |
OLD | NEW |