diff options
| author | bajones <bajones@chromium.org> | 2015-06-19 14:18:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-19 21:19:06 +0000 |
| commit | e33731cd7108536b56e18e722af5c9d425c47d55 (patch) | |
| tree | 8204063add03e33117884f9429912c5713e895cd /content/public/common | |
| parent | eb98b94974d462ebef0f24c82da259e1b759e781 (diff) | |
| download | chromium_src-e33731cd7108536b56e18e722af5c9d425c47d55.zip chromium_src-e33731cd7108536b56e18e722af5c9d425c47d55.tar.gz chromium_src-e33731cd7108536b56e18e722af5c9d425c47d55.tar.bz2 | |
Revert "Adding Chrome-side WebVR interface and Cardboard implementation"
This reverts commit 4ab52def6d1861a55fd9864b47f56c16e4b423a0.
Commit broke Android M bots due to cardboard-java's use of
android.util.FloatMath, which was deprecated in API level 22
(see http://developer.android.com/reference/android/util/FloatMath.html)
BUG=389343
TBR=tsepez@chromium.org, mpearson@chromium.org, jochen@chromium.org
Review URL: https://codereview.chromium.org/1198513003
Cr-Commit-Position: refs/heads/master@{#335349}
Diffstat (limited to 'content/public/common')
| -rw-r--r-- | content/public/common/content_switches.cc | 3 | ||||
| -rw-r--r-- | content/public/common/content_switches.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index 5c8efcd..1f7e4b0 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -477,9 +477,6 @@ const char kEnableWebGLDraftExtensions[] = "enable-webgl-draft-extensions"; // Enables WebGL rendering into a scanout buffer for overlay support. const char kEnableWebGLImageChromium[] = "enable-webgl-image-chromium"; -// Enables interaction with virtual reality devices. -const char kEnableWebVR[] = "enable-webvr"; - // Enable rasterizer that writes directly to GPU memory associated with tiles. const char kEnableZeroCopy[] = "enable-zero-copy"; diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index 4b45d2e..aead5ac 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -142,7 +142,6 @@ CONTENT_EXPORT extern const char kInvertViewportScrollOrder[]; CONTENT_EXPORT extern const char kEnableVtune[]; CONTENT_EXPORT extern const char kEnableWebGLDraftExtensions[]; CONTENT_EXPORT extern const char kEnableWebGLImageChromium[]; -CONTENT_EXPORT extern const char kEnableWebVR[]; CONTENT_EXPORT extern const char kEnableZeroCopy[]; CONTENT_EXPORT extern const char kExplicitlyAllowedPorts[]; CONTENT_EXPORT extern const char kExtraPluginDir[]; |