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

Unified Diff: device/vr/vr_device_manager.cc

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_manager.h ('k') | device/vr/vr_device_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/vr/vr_device_manager.cc
diff --git a/device/vr/vr_device_manager.cc b/device/vr/vr_device_manager.cc
index c7a20a1b03a8f7e2a12f78faadcdf474d16156a9..4d960baa732c89037c35cb0ab5fe796fffd7edf3 100644
--- a/device/vr/vr_device_manager.cc
+++ b/device/vr/vr_device_manager.cc
@@ -44,8 +44,7 @@ VRDeviceManager::~VRDeviceManager() {
g_vr_device_manager = nullptr;
}
-void VRDeviceManager::BindRequest(
- mojo::InterfaceRequest<blink::mojom::VRService> request) {
+void VRDeviceManager::BindRequest(mojo::InterfaceRequest<VRService> request) {
VRDeviceManager* device_manager = GetInstance();
device_manager->bindings_.AddBinding(device_manager, std::move(request));
}
@@ -77,7 +76,7 @@ bool VRDeviceManager::HasInstance() {
return !!g_vr_device_manager;
}
-mojo::Array<blink::mojom::VRDisplayPtr> VRDeviceManager::GetVRDevices() {
+mojo::Array<VRDisplayPtr> VRDeviceManager::GetVRDevices() {
DCHECK(thread_checker_.CalledOnValidThread());
InitializeProviders();
@@ -86,7 +85,7 @@ mojo::Array<blink::mojom::VRDisplayPtr> VRDeviceManager::GetVRDevices() {
for (const auto& provider : providers_)
provider->GetDevices(&devices);
- mojo::Array<blink::mojom::VRDisplayPtr> out_devices;
+ mojo::Array<VRDisplayPtr> out_devices;
for (const auto& device : devices) {
if (device->id() == VR_DEVICE_LAST_ID)
continue;
@@ -94,7 +93,7 @@ mojo::Array<blink::mojom::VRDisplayPtr> VRDeviceManager::GetVRDevices() {
if (devices_.find(device->id()) == devices_.end())
devices_[device->id()] = device;
- blink::mojom::VRDisplayPtr vr_device_info = device->GetVRDevice();
+ VRDisplayPtr vr_device_info = device->GetVRDevice();
if (vr_device_info.is_null())
continue;
« no previous file with comments | « device/vr/vr_device_manager.h ('k') | device/vr/vr_device_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698