Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1079)

Unified Diff: content/browser/vr/vr_device_manager.h

Issue 1808203005: [OnionSoup] Moving VR service from content to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reworked as per new comments. Fixed build errors! Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/vr/vr_device_manager.h
diff --git a/content/browser/vr/vr_device_manager.h b/content/browser/vr/vr_device_manager.h
index 9431eddf9f12cb0fd5a450beeaa14388579e7706..666b51a52da0850cd31953b69c65263c46581c80 100644
--- a/content/browser/vr/vr_device_manager.h
+++ b/content/browser/vr/vr_device_manager.h
@@ -17,21 +17,22 @@
#include "content/browser/vr/vr_device.h"
#include "content/browser/vr/vr_device_provider.h"
#include "content/common/content_export.h"
-#include "content/common/vr_service.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
+#include "third_party/WebKit/public/platform/modules/vr/vr_service.mojom.h"
namespace content {
-class VRDeviceManager : public mojom::VRService {
+class VRDeviceManager : public blink::mojom::VRService {
public:
~VRDeviceManager() override;
- static void BindRequest(mojo::InterfaceRequest<mojom::VRService> request);
+ static void BindRequest(
+ mojo::InterfaceRequest<blink::mojom::VRService> request);
// Returns the VRDeviceManager singleton.
static VRDeviceManager* GetInstance();
- mojo::Array<mojom::VRDeviceInfoPtr> GetVRDevices();
+ mojo::Array<blink::mojom::VRDeviceInfoPtr> GetVRDevices();
VRDevice* GetDevice(unsigned int index);
private:
@@ -65,7 +66,7 @@ class VRDeviceManager : public mojom::VRService {
bool vr_initialized_;
- mojo::BindingSet<mojom::VRService> bindings_;
+ mojo::BindingSet<blink::mojom::VRService> bindings_;
// For testing. If true will not delete self when consumer count reaches 0.
bool keep_alive_;

Powered by Google App Engine
This is Rietveld 408576698