[OnionSoup] Moving VR service from content to Blink

third_party/WebKit/Source/modules/vr/VRController.h

Index: third_party/WebKit/Source/modules/vr/VRController.h
diff --git a/third_party/WebKit/Source/modules/vr/VRController.h b/third_party/WebKit/Source/modules/vr/VRController.h
index eb4e0eaa41bc5c2d2b779aefcdcf36cc6977296f..9368f560951237eee26788f310b23597ff66647b 100644
--- a/third_party/WebKit/Source/modules/vr/VRController.h
+++ b/third_party/WebKit/Source/modules/vr/VRController.h
@@ -7,12 +7,16 @@
 
 #include "core/frame/LocalFrameLifecycleObserver.h"
 #include "modules/ModulesExport.h"
+#include "modules/vr/VRTypeConverters.h"
 #include "platform/Supplementable.h"
-#include "public/platform/modules/vr/WebVR.h"
-#include "public/platform/modules/vr/WebVRClient.h"
+#include "wtf/Deque.h"
+#include "wtf/PassOwnPtr.h"

[dcheng, 2016/05/03 21:48:14]

Not needed anymore. But #include <memory> please.

[RaviKasibhatla, 2016/05/04 08:54:37]

Done.

 
 namespace blink {
 
+class ServiceRegistry;
+class VRGetDevicesCallback;
+
 class MODULES_EXPORT VRController final
     : public GarbageCollectedFinalized<VRController>
     , public Supplement<LocalFrame>
@@ -22,25 +26,29 @@ class MODULES_EXPORT VRController final
 public:
     virtual ~VRController();
 
-    void getDevices(WebVRGetDevicesCallback*);
+    void getDevices(std::unique_ptr<VRGetDevicesCallback>);
 
     void getSensorState(unsigned index, WebHMDSensorState& into);
 
     void resetSensor(unsigned index);
 
-    static void provideTo(LocalFrame&, WebVRClient*);
+    static void provideTo(LocalFrame&, ServiceRegistry*);
     static VRController* from(LocalFrame&);
     static const char* supplementName();
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    VRController(LocalFrame&, WebVRClient*);
+    VRController(LocalFrame&, ServiceRegistry*);
 
     // Inherited from LocalFrameLifecycleObserver.
     void willDetachFrameHost() override;
 
-    WebVRClient* m_client;
+    // Binding callbacks.
+    void OnGetDevices(const mojo::Array<mojom::VRDeviceInfoPtr>&);
+
+    WTF::Deque<std::unique_ptr<VRGetDevicesCallback>> m_pendingGetDevicesCallbacks;
+    mojom::VRServicePtr m_service;
 };
 
 } // namespace blink