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 45 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(weak_ptr_factory_.GetWeakPtr());
 }
 
+// VR presentation exit requested by the API.
 void GvrDeviceProvider::ExitPresent() {
-  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();
 }
 
 void GvrDeviceProvider::OnGvrDelegateReady(
     const base::WeakPtr<GvrDelegate>& delegate) {
   if (!vr_device_)
     return;
   vr_device_->SetDelegate(delegate);
   GamepadDataFetcherManager::GetInstance()->AddFactory(
       new GvrGamepadDataFetcher::Factory(delegate, vr_device_->id()));
 }
 
+// VR presentation exit requested by the delegate (probably via UI).
 void GvrDeviceProvider::OnGvrDelegateRemoved() {
-  ExitPresent();
+  if (!vr_device_)
+    return;
+
+  SwitchToNonPresentingDelegate();
+  vr_device_->OnExitPresent();
 }
 
 void GvrDeviceProvider::OnDisplayBlur() {
   if (!vr_device_)
     return;
   vr_device_->OnDisplayBlur();
 }
 
 void GvrDeviceProvider::OnDisplayFocus() {
   if (!vr_device_)
     return;
   vr_device_->OnDisplayFocus();
 }
 
+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