Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2615973002: Always include "enable-webvr" in about:flags (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1611 matching lines...) Expand 10 before | Expand all | Expand 10 after
1622 {"mac-views-native-app-windows", 1622 {"mac-views-native-app-windows",
1623 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME, 1623 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_NAME,
1624 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac, 1624 IDS_FLAGS_MAC_VIEWS_NATIVE_APP_WINDOWS_DESCRIPTION, kOsMac,
1625 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows, 1625 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableMacViewsNativeAppWindows,
1626 switches::kDisableMacViewsNativeAppWindows)}, 1626 switches::kDisableMacViewsNativeAppWindows)},
1627 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME, 1627 {"app-window-cycling", IDS_FLAGS_APP_WINDOW_CYCLING_NAME,
1628 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac, 1628 IDS_FLAGS_APP_WINDOW_CYCLING_DESCRIPTION, kOsMac,
1629 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling, 1629 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAppWindowCycling,
1630 switches::kDisableAppWindowCycling)}, 1630 switches::kDisableAppWindowCycling)},
1631 #endif // OS_MACOSX 1631 #endif // OS_MACOSX
1632 #if defined(ENABLE_WEBVR)
1633 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll, 1632 {"enable-webvr", IDS_FLAGS_WEBVR_NAME, IDS_FLAGS_WEBVR_DESCRIPTION, kOsAll,
1634 SINGLE_VALUE_TYPE(switches::kEnableWebVR)}, 1633 SINGLE_VALUE_TYPE(switches::kEnableWebVR)},
1635 #endif // ENABLE_WEBVR
1636 #if defined(ENABLE_VR_SHELL) 1634 #if defined(ENABLE_VR_SHELL)
1637 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME, 1635 {"enable-vr-shell", IDS_FLAGS_ENABLE_VR_SHELL_NAME,
1638 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid, 1636 IDS_FLAGS_ENABLE_VR_SHELL_DESCRIPTION, kOsAndroid,
1639 FEATURE_VALUE_TYPE(features::kVrShell)}, 1637 FEATURE_VALUE_TYPE(features::kVrShell)},
1640 #endif // ENABLE_VR_SHELL 1638 #endif // ENABLE_VR_SHELL
1641 #if defined(OS_CHROMEOS) 1639 #if defined(OS_CHROMEOS)
1642 {"disable-accelerated-mjpeg-decode", 1640 {"disable-accelerated-mjpeg-decode",
1643 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_NAME, 1641 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_NAME,
1644 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_DESCRIPTION, kOsCrOS, 1642 IDS_FLAGS_ACCELERATED_MJPEG_DECODE_DESCRIPTION, kOsCrOS,
1645 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, 1643 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
2376 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2374 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2377 2375
2378 const FeatureEntry* GetFeatureEntries(size_t* count) { 2376 const FeatureEntry* GetFeatureEntries(size_t* count) {
2379 *count = arraysize(kFeatureEntries); 2377 *count = arraysize(kFeatureEntries);
2380 return kFeatureEntries; 2378 return kFeatureEntries;
2381 } 2379 }
2382 2380
2383 } // namespace testing 2381 } // namespace testing
2384 2382
2385 } // namespace about_flags 2383 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698