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

Unified Diff: chrome/browser/android/vr_shell/vr_shell.cc

Issue 2851313002: Adds end-to-end tests for VrShell navigation transitions. (Closed)
Patch Set: Rebased on ToT, incorporated review feedback 3 Created 3 years, 8 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
Index: chrome/browser/android/vr_shell/vr_shell.cc
diff --git a/chrome/browser/android/vr_shell/vr_shell.cc b/chrome/browser/android/vr_shell/vr_shell.cc
index 1917ddbef19bccb8195c63e9dc0a1d1bd400e840..d09aeb974e062d44ac0f681e9c7016db858ac099 100644
--- a/chrome/browser/android/vr_shell/vr_shell.cc
+++ b/chrome/browser/android/vr_shell/vr_shell.cc
@@ -262,7 +262,7 @@ void VrShell::SetSurface(JNIEnv* env,
}
void VrShell::SetWebVrMode(JNIEnv* env,
- const base::android::JavaParamRef<jobject>& obj,
+ const JavaParamRef<jobject>& obj,
bool enabled) {
webvr_mode_ = enabled;
if (metrics_helper_)
@@ -276,6 +276,10 @@ void VrShell::SetWebVrMode(JNIEnv* env,
gl_thread_->GetSceneManager(), enabled));
}
+bool VrShell::GetWebVrMode(JNIEnv* env, const JavaParamRef<jobject>& obj) {
+ return webvr_mode_;
+}
+
void VrShell::OnLoadProgressChanged(JNIEnv* env,
const JavaParamRef<jobject>& obj,
double progress) {
@@ -560,7 +564,7 @@ void VrShell::RegisterGamepadDataFetcher(
jlong Init(JNIEnv* env,
const JavaParamRef<jobject>& obj,
- const base::android::JavaParamRef<jobject>& delegate,
+ const JavaParamRef<jobject>& delegate,
jlong window_android,
jboolean for_web_vr,
jlong gvr_api,

Powered by Google App Engine
This is Rietveld 408576698