| 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 f9152a5bd3a640c629600919a9a47562f9ce33e4..524baff41b620213542882bbe033bb2239122a1a 100644
|
| --- a/chrome/browser/android/vr_shell/vr_shell.cc
|
| +++ b/chrome/browser/android/vr_shell/vr_shell.cc
|
| @@ -188,6 +188,8 @@ VrShell::VrShell(JNIEnv* env,
|
| ui_input_manager_.reset(new VrInputManager(ui_contents_));
|
| weak_content_input_manager_ = content_input_manager_->GetWeakPtr();
|
| weak_ui_input_manager_ = ui_input_manager_->GetWeakPtr();
|
| +
|
| + SetShowingOverscrollGlowOnUI(false);
|
| }
|
|
|
| void VrShell::UpdateCompositorLayersOnUI(JNIEnv* env,
|
| @@ -939,6 +941,7 @@ void VrShell::OnPauseOnUI(JNIEnv* env, const JavaParamRef<jobject>& obj) {
|
| // TODO(mthiesse): Clean up threading here.
|
| controller_->OnPause();
|
| gvr_api_->PauseTracking();
|
| + SetShowingOverscrollGlowOnUI(true);
|
|
|
| // exit vr session
|
| metrics_helper_->SetVRActive(false);
|
| @@ -952,11 +955,17 @@ void VrShell::OnResumeOnUI(JNIEnv* env, const JavaParamRef<jobject>& obj) {
|
| gvr_api_->RefreshViewerProfile();
|
| gvr_api_->ResumeTracking();
|
| controller_->OnResume();
|
| + SetShowingOverscrollGlowOnUI(false);
|
|
|
| // exit vr session
|
| metrics_helper_->SetVRActive(true);
|
| }
|
|
|
| +void VrShell::SetShowingOverscrollGlowOnUI(bool showing_glow) {
|
| + main_contents_->GetRenderWidgetHostView()->SetShowingOverscrollGlow(
|
| + showing_glow);
|
| +}
|
| +
|
| base::WeakPtr<VrShell> VrShell::GetWeakPtrOnUI(
|
| const content::WebContents* web_contents) {
|
| // Ensure that the WebContents requesting the VrShell instance is the one
|
|
|