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

Unified Diff: device/vr/vr_device_manager.h

Issue 2041003003: Moved vr_service.mojom from blink to device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed missing mojo dependency in gyp builds Created 4 years, 6 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
« no previous file with comments | « device/vr/vr_device.h ('k') | device/vr/vr_device_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/vr/vr_device_manager.h
diff --git a/device/vr/vr_device_manager.h b/device/vr/vr_device_manager.h
index 6d28ee476bf7eca8f28b79bccd3ba39d6a535fbf..82a958b3b9e35a80343f53b8e6c4e3864bdcf4b9 100644
--- a/device/vr/vr_device_manager.h
+++ b/device/vr/vr_device_manager.h
@@ -17,22 +17,22 @@
#include "device/vr/vr_device.h"
#include "device/vr/vr_device_provider.h"
#include "device/vr/vr_export.h"
+#include "device/vr/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 device {
-class VRDeviceManager : public blink::mojom::VRService {
+class VRDeviceManager : public VRService {
public:
DEVICE_VR_EXPORT ~VRDeviceManager() override;
DEVICE_VR_EXPORT static void BindRequest(
- mojo::InterfaceRequest<blink::mojom::VRService> request);
+ mojo::InterfaceRequest<VRService> request);
// Returns the VRDeviceManager singleton.
static VRDeviceManager* GetInstance();
- DEVICE_VR_EXPORT mojo::Array<blink::mojom::VRDisplayPtr> GetVRDevices();
+ DEVICE_VR_EXPORT mojo::Array<VRDisplayPtr> GetVRDevices();
DEVICE_VR_EXPORT VRDevice* GetDevice(unsigned int index);
private:
@@ -66,7 +66,7 @@ class VRDeviceManager : public blink::mojom::VRService {
bool vr_initialized_;
- mojo::BindingSet<blink::mojom::VRService> bindings_;
+ mojo::BindingSet<VRService> bindings_;
// For testing. If true will not delete self when consumer count reaches 0.
bool keep_alive_;
« no previous file with comments | « device/vr/vr_device.h ('k') | device/vr/vr_device_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698