Enable magic window mode with new Gvr

device/vr/android/gvr/gvr_delegate.h

 // 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.
 
 #ifndef DEVICE_VR_ANDROID_GVR_DELEGATE_H
 #define DEVICE_VR_ANDROID_GVR_DELEGATE_H
 
 #include "device/vr/android/gvr/gvr_device_provider.h"
 #include "device/vr/vr_export.h"
 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 
 namespace gvr {
 class GvrApi;
 }  // namespace gvr
 
 namespace device {
 
-class DEVICE_VR_EXPORT GvrDelegateProvider {
- public:
-  static void SetInstance(GvrDelegateProvider* delegate_provider);
-  static GvrDelegateProvider* GetInstance();
-
-  virtual bool RequestWebVRPresent(GvrDeviceProvider* device_provider) = 0;
-  virtual void ExitWebVRPresent() = 0;
-
- private:
-  static GvrDelegateProvider* delegate_provider_;
-};
-
 class DEVICE_VR_EXPORT GvrDelegate {
  public:
   virtual void SetWebVRSecureOrigin(bool secure_origin) = 0;
   virtual void SubmitWebVRFrame() = 0;
   virtual void UpdateWebVRTextureBounds(int eye,
                                         float left,
                                         float top,
                                         float width,
                                         float height) = 0;
   virtual void SetGvrPoseForWebVr(const gvr::Mat4f& pose,
                                   uint32_t pose_index) = 0;
   virtual gvr::GvrApi* gvr_api() = 0;
 };
 
+class DEVICE_VR_EXPORT GvrDelegateProvider {
+ public:
+  static void SetInstance(GvrDelegateProvider* delegate_provider);
+  static GvrDelegateProvider* GetInstance();
+
+  virtual bool RequestWebVRPresent(GvrDeviceProvider* device_provider) = 0;
+  virtual void ExitWebVRPresent() = 0;
+  virtual GvrDelegate* GetNonPresentingDelegate() = 0;
+  virtual void DestroyNonPresentingDelegate() = 0;
+
+ private:
+  static GvrDelegateProvider* delegate_provider_;
+};
+
 }  // namespace device
 
 #endif  // DEVICE_VR_ANDROID_GVR_DELEGATE_H