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 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1604 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, | 1604 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, |
1605 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, | 1605 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, |
1606 switches::kDisableMacViewsNativeAppWindows)}, | 1606 switches::kDisableMacViewsNativeAppWindows)}, |
1607 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, | 1607 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, |
1608 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, | 1608 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, |
1609 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, | 1609 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, |
1610 switches::kDisableAppWindowCycling)}, | 1610 switches::kDisableAppWindowCycling)}, |
1611 #endif // OS_MACOSX | 1611 #endif // OS_MACOSX |
1612 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, | 1612 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, |
1613 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, | 1613 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, |
1614 {"enable-webvr-experimental-rendering", | |
amp
2017/02/14 23:23:26
Let's only show this when webvr is enabled (which
klausw
2017/02/14 23:31:29
Done.
| |
1615 IDS_FLAGS_WEBVR_EXPERIMENTAL_RENDERING_NAME, | |
1616 IDS_FLAGS_WEBVR_EXPERIMENTAL_RENDERING_DESCRIPTION, kOsAll, | |
1617 SINGLE_VALUE_TYPE(switches::kEnableWebVRExperimentalRendering)}, | |
1614 #if defined(ENABLE_WEBVR) | 1618 #if defined(ENABLE_WEBVR) |
1615 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, | 1619 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, |
1616 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, | 1620 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, |
1617 FEATURE_VALUE_TYPE(features::kVrShell)}, | 1621 FEATURE_VALUE_TYPE(features::kVrShell)}, |
1618 #endif | 1622 #endif |
1619 #if defined(OS_CHROMEOS) | 1623 #if defined(OS_CHROMEOS) |
1620 {"disable-accelerated-mjpeg-decode", | 1624 {"disable-accelerated-mjpeg-decode", |
1621 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_NAME, | 1625 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_NAME, |
1622 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_DESCRIPTION, kOsCrOS, | 1626 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_DESCRIPTION, kOsCrOS, |
1623 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, | 1627 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, |
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2445 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; | 2449 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; |
2446 | 2450 |
2447 const FeatureEntry* GetFeatureEntries(size_t* count) { | 2451 const FeatureEntry* GetFeatureEntries(size_t* count) { |
2448 *count = arraysize(kFeatureEntries); | 2452 *count = arraysize(kFeatureEntries); |
2449 return kFeatureEntries; | 2453 return kFeatureEntries; |
2450 } | 2454 } |
2451 | 2455 |
2452 } // namespace testing | 2456 } // namespace testing |
2453 | 2457 |
2454 } // namespace about_flags | 2458 } // namespace about_flags |
OLD | NEW |