Fix exiting WebVR via Android UI not fully exiting fullscreen.

device/vr/android/gvr/gvr_device_provider.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/vr/android/gvr/gvr_device_provider.h"
 
 #include <jni.h>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
@@ skipping 47 matching lines @@
 bool GvrDeviceProvider::RequestPresent() {
   device::GvrDelegateProvider* delegate_provider =
       device::GvrDelegateProvider::GetInstance();
   if (!delegate_provider)
     return false;
 
   // RequestWebVRPresent is async as a render thread may be created.
   return delegate_provider->RequestWebVRPresent(this);
 }
 
+// VR presentation exit requested by the API

[mthiesse, 2016/11/14 16:24:12]

super nit: periods at the end of comments, here and below.

 void GvrDeviceProvider::ExitPresent() {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
 
-  if (!vr_device_)
-    return;
-
-  device::GvrDelegateProvider* delegate_provider =
-      device::GvrDelegateProvider::GetInstance();
-  if (!delegate_provider)
-    return;
-
-  vr_device_->SetDelegate(delegate_provider->GetNonPresentingDelegate());
-
-  GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory(
-      GAMEPAD_SOURCE_GVR);
-
-  delegate_provider->ExitWebVRPresent();
+  SwitchToNonPresentingDelegate();

[mthiesse, 2016/11/14 16:24:12]

Why do we not call vr_device_->OnExitPresent() here?

[bajones, 2016/11/14 19:35:43]

This is confusing (need to look at how to make this clearer) but it's because
this is called the vr_device_->ExitPresent, which itself calls OnExitPresent

[mthiesse, 2016/11/14 20:06:49]

Fine to leave it for now I guess, but that definitely needs a refactoring.
Exiting presentation differently based on whether or not it was started by this
class is really not great.

 }
 
 void GvrDeviceProvider::OnGvrDelegateReady(GvrDelegate* delegate) {
   main_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&GvrDeviceProvider::GvrDelegateReady, base::Unretained(this),
                  base::Unretained(delegate)));
 }
 
+// VR presentation exit requested by the delegate (probably via UI)
 void GvrDeviceProvider::OnGvrDelegateRemoved() {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
   if (!vr_device_)
     return;
-  ExitPresent();
+
+  SwitchToNonPresentingDelegate();
+  vr_device_->OnExitPresent();
 }
 
 void GvrDeviceProvider::GvrDelegateReady(GvrDelegate* delegate) {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
 
   vr_device_->SetDelegate(delegate);
   GamepadDataFetcherManager::GetInstance()->AddFactory(
       new GvrGamepadDataFetcher::Factory(delegate, vr_device_->id()));
 }
 
+void GvrDeviceProvider::SwitchToNonPresentingDelegate() {
+  GvrDelegateProvider* delegate_provider = GvrDelegateProvider::GetInstance();
+  if (!vr_device_ || !delegate_provider)
+    return;
+
+  vr_device_->SetDelegate(delegate_provider->GetNonPresentingDelegate());
+
+  // Remove GVR gamepad polling.
+  GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory(
+      GAMEPAD_SOURCE_GVR);
+
+  // If we're presenting currently stop.
+  delegate_provider->ExitWebVRPresent();
+}
+
 }  // namespace device