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 1969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1980 kOsMac, | 1980 kOsMac, |
1981 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac, | 1981 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppInfoDialogMac, |
1982 switches::kDisableAppInfoDialogMac)}, | 1982 switches::kDisableAppInfoDialogMac)}, |
1983 {"mac-views-native-app-windows", | 1983 {"mac-views-native-app-windows", |
1984 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, | 1984 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, |
1985 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, | 1985 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, |
1986 kOsMac, | 1986 kOsMac, |
1987 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, | 1987 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, |
1988 switches::kDisableMacViewsNativeAppWindows)}, | 1988 switches::kDisableMacViewsNativeAppWindows)}, |
1989 #endif | 1989 #endif |
| 1990 #if defined(ENABLE_WEBVR) |
| 1991 {"enable-webvr", |
| 1992 IDS_FLAGS_ENABLE_WEBVR_NAME, |
| 1993 IDS_FLAGS_ENABLE_WEBVR_DESCRIPTION, |
| 1994 kOsAll, |
| 1995 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, |
| 1996 #endif |
1990 // NOTE: Adding new command-line switches requires adding corresponding | 1997 // NOTE: Adding new command-line switches requires adding corresponding |
1991 // entries to enum "LoginCustomFlags" in histograms.xml. See note in | 1998 // entries to enum "LoginCustomFlags" in histograms.xml. See note in |
1992 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. | 1999 // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test. |
1993 }; | 2000 }; |
1994 | 2001 |
1995 const Experiment* experiments = kExperiments; | 2002 const Experiment* experiments = kExperiments; |
1996 size_t num_experiments = arraysize(kExperiments); | 2003 size_t num_experiments = arraysize(kExperiments); |
1997 | 2004 |
1998 // Stores and encapsulates the little state that about:flags has. | 2005 // Stores and encapsulates the little state that about:flags has. |
1999 class FlagsState { | 2006 class FlagsState { |
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2594 } | 2601 } |
2595 | 2602 |
2596 const Experiment* GetExperiments(size_t* count) { | 2603 const Experiment* GetExperiments(size_t* count) { |
2597 *count = num_experiments; | 2604 *count = num_experiments; |
2598 return experiments; | 2605 return experiments; |
2599 } | 2606 } |
2600 | 2607 |
2601 } // namespace testing | 2608 } // namespace testing |
2602 | 2609 |
2603 } // namespace about_flags | 2610 } // namespace about_flags |
OLD | NEW |