| 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 f4c2b18f712803ae490ef15ed47c9d50c7b44511..c3f265e58c47ff23f73285679c83daef5c3aaac1 100644
|
| --- a/chrome/browser/android/vr_shell/vr_shell.h
|
| +++ b/chrome/browser/android/vr_shell/vr_shell.h
|
| @@ -73,7 +73,7 @@ class VrShell : public device::PresentingGvrDelegate,
|
| 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,
|
| @@ -91,13 +91,15 @@ class VrShell : public device::PresentingGvrDelegate,
|
| 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 enabled);
|
| bool GetWebVrMode(JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj);
|
| void OnFullscreenChanged(bool enabled);
|
|
|