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

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

Issue 2490003003: Remove gvr SDK dependency (Closed)
Patch Set: rebase Created 4 years, 1 month 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
Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
index 317fa4e30a56fd3a752ce0384685898134b98a91..94b4228b6cdd238d888b18f76c2bd9b286510b01 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java
@@ -52,10 +52,12 @@ public class VrShellDelegate {
private boolean mInVr;
private int mRestoreSystemUiVisibilityFlag = -1;
private int mRestoreOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
- private String mVrExtra;
private long mNativeVrShellDelegate;
private Tab mTab;
+ // TODO(bshe): This should be replaced by string provided by NDK. Currently, it only available
+ // in SDK and we don't want add dependency to SDK just to get this string. So hard code it here.
+ private static final String DAYDREAM_VR_EXTRA = "android.intent.extra.VR_LAUNCH";
private static final String DAYDREAM_DON_AUTO_TRANSITION =
"org.chromium.chrome.browser.vr_shell.DAYDREAM_DON_AUTO_TRANSITION";
@@ -63,16 +65,7 @@ public class VrShellDelegate {
mActivity = activity;
mVrAvailable = maybeFindVrClasses();
- if (mVrAvailable) {
- try {
- mVrExtra = (String) mVrShellClass.getField("VR_EXTRA").get(null);
- } catch (IllegalAccessException | IllegalArgumentException | NoSuchFieldException e) {
- Log.e(TAG, "Unable to read VR_EXTRA field", e);
- mVrAvailable = false;
- }
- createVrDaydreamApi();
- }
-
+ createVrDaydreamApi();
mTabObserver = new EmptyTabObserver() {
@Override
public void onContentChanged(Tab tab) {
@@ -406,7 +399,7 @@ public class VrShellDelegate {
public boolean isVrIntent(Intent intent) {
if (intent == null) return false;
return intent.getBooleanExtra(DAYDREAM_DON_AUTO_TRANSITION, false)
- || intent.getBooleanExtra(mVrExtra, false);
+ || intent.getBooleanExtra(DAYDREAM_VR_EXTRA, false);
}
/**
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698