| Index: chrome/browser/android/vr_shell/vr_shell.h
|
| diff --git a/chrome/browser/android/vr_shell/vr_shell.h b/chrome/browser/android/vr_shell/vr_shell.h
|
| index c675a3711612010d59dc1aea95a6ae8331089c1a..26d1c4994b413418d8b92f057c52933164187a95 100644
|
| --- a/chrome/browser/android/vr_shell/vr_shell.h
|
| +++ b/chrome/browser/android/vr_shell/vr_shell.h
|
| @@ -68,7 +68,7 @@ class VrShell : public device::GvrDelegate,
|
| jobject obj,
|
| ui::WindowAndroid* window,
|
| bool for_web_vr,
|
| - bool web_vr_autopresented,
|
| + bool web_vr_autopresentation_expected,
|
| bool in_cct,
|
| VrShellDelegate* delegate,
|
| gvr_context* gvr_api,
|
| @@ -86,13 +86,15 @@ class VrShell : public device::GvrDelegate,
|
| bool touched);
|
| void OnPause(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
|
| void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
|
| + void SetSplashScreenIcon(JNIEnv* env,
|
| + const base::android::JavaParamRef<jobject>& obj,
|
| + const base::android::JavaParamRef<jobject>& bitmap);
|
| void SetSurface(JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj,
|
| const base::android::JavaParamRef<jobject>& surface);
|
| void SetWebVrMode(JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj,
|
| bool enabled,
|
| - bool auto_presented,
|
| bool show_toast);
|
| bool GetWebVrMode(JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj);
|
|
|