| Index: chrome/browser/android/vr_shell/vr_gl_thread.h
|
| diff --git a/chrome/browser/android/vr_shell/vr_gl_thread.h b/chrome/browser/android/vr_shell/vr_gl_thread.h
|
| index c7709a044a1bc7faf2ce16b4aa28e63cb12f6374..fdf6b13b0d561fcdd84f21a6e97f2ae0bf131cd2 100644
|
| --- a/chrome/browser/android/vr_shell/vr_gl_thread.h
|
| +++ b/chrome/browser/android/vr_shell/vr_gl_thread.h
|
| @@ -35,7 +35,7 @@ class VrGLThread : public base::Thread,
|
| scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
|
| gvr_context* gvr_api,
|
| bool initially_web_vr,
|
| - bool web_vr_autopresented,
|
| + bool web_vr_autopresentation_expected,
|
| bool in_cct,
|
| bool reprojected_rendering,
|
| bool daydream_support);
|
| @@ -76,12 +76,13 @@ class VrGLThread : public base::Thread,
|
| void SetLoading(bool loading) override;
|
| void SetSecurityLevel(security_state::SecurityLevel level) override;
|
| void SetURL(const GURL& gurl) override;
|
| - void SetWebVrMode(bool enabled, bool auto_presented) override;
|
| + void SetWebVrMode(bool enabled) override;
|
| void SetWebVrSecureOrigin(bool secure) override;
|
| void SetVideoCapturingIndicator(bool enabled) override;
|
| void SetScreenCapturingIndicator(bool enabled) override;
|
| void SetAudioCapturingIndicator(bool enabled) override;
|
| void SetIsExiting() override;
|
| + void SetSplashScreenIcon(SkBitmap bitmap) override;
|
|
|
| protected:
|
| void Init() override;
|
| @@ -100,7 +101,7 @@ class VrGLThread : public base::Thread,
|
| scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
|
| gvr_context* gvr_api_;
|
| bool initially_web_vr_;
|
| - bool web_vr_autopresented_;
|
| + bool web_vr_autopresentation_expected_;
|
| bool in_cct_;
|
| bool reprojected_rendering_;
|
| bool daydream_support_;
|
|
|