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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java

Issue 2668003006: Add restriction for running tests only with Daydream View headset (Closed)
Patch Set: Address tedchoc@ comments Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java
index 2f1fcc4911ea6a472b47709b37072317675a99a7..dfba89bf30fd871735ec7384427ae1cd08e677a9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java
@@ -5,11 +5,13 @@
package org.chromium.chrome.browser.vr_shell;
import android.app.Activity;
+import android.content.Context;
import android.os.StrictMode;
import com.google.vr.ndk.base.AndroidCompat;
import org.chromium.base.Log;
+import org.chromium.base.VisibleForTesting;
import org.chromium.base.annotations.UsedByReflection;
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -20,18 +22,24 @@ import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@UsedByReflection("VrShellDelegate.java")
public class VrClassesWrapperImpl implements VrClassesWrapper {
private static final String TAG = "VrClassesWrapperImpl";
- private final Activity mActivity;
+ private final Context mContext;
@UsedByReflection("VrShellDelegate.java")
public VrClassesWrapperImpl(Activity activity) {
- mActivity = activity;
+ mContext = activity;
+ }
+
+ @UsedByReflection("ChromeInstrumentationTestRunner.java")
+ @VisibleForTesting
+ public VrClassesWrapperImpl(Context context) {
+ mContext = context;
}
@Override
public NonPresentingGvrContext createNonPresentingGvrContext() {
StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
try {
- return new NonPresentingGvrContextImpl(mActivity);
+ return new NonPresentingGvrContextImpl((Activity) mContext);
} catch (Exception ex) {
Log.e(TAG, "Unable to instantiate NonPresentingGvrContextImpl", ex);
return null;
@@ -44,7 +52,7 @@ public class VrClassesWrapperImpl implements VrClassesWrapper {
public VrShell createVrShell(CompositorViewHolder compositorViewHolder) {
StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
try {
- return new VrShellImpl(mActivity, compositorViewHolder);
+ return new VrShellImpl((Activity) mContext, compositorViewHolder);
} catch (Exception ex) {
Log.e(TAG, "Unable to instantiate VrShellImpl", ex);
return null;
@@ -55,7 +63,7 @@ public class VrClassesWrapperImpl implements VrClassesWrapper {
@Override
public VrDaydreamApi createVrDaydreamApi() {
- return new VrDaydreamApiImpl(mActivity);
+ return new VrDaydreamApiImpl(mContext);
}
@Override
@@ -65,6 +73,6 @@ public class VrClassesWrapperImpl implements VrClassesWrapper {
@Override
public void setVrModeEnabled(boolean enabled) {
- AndroidCompat.setVrModeEnabled(mActivity, enabled);
+ AndroidCompat.setVrModeEnabled((Activity) mContext, enabled);
}
}
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698