Moved vr_service.mojom from blink to device

device/vr/android/cardboard/cardboard_vr_device.cc

 // Copyright 2015 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.
 
 #include "device/vr/android/cardboard/cardboard_vr_device.h"
 
 #include <math.h>
 #include <algorithm>
 
 #include "base/android/context_utils.h"
@@ skipping 22 matching lines @@
   j_cardboard_device_.Reset(Java_CardboardVRDevice_create(
       env, base::android::GetApplicationContext()));
   j_head_matrix_.Reset(env, env->NewFloatArray(16));
 }
 
 CardboardVRDevice::~CardboardVRDevice() {
   Java_CardboardVRDevice_stopTracking(AttachCurrentThread(),
                                       j_cardboard_device_.obj());
 }
 
-blink::mojom::VRDisplayPtr CardboardVRDevice::GetVRDevice() {
+VRDisplayPtr CardboardVRDevice::GetVRDevice() {
   TRACE_EVENT0("input", "CardboardVRDevice::GetVRDevice");
-  blink::mojom::VRDisplayPtr device = blink::mojom::VRDisplay::New();
+  VRDisplayPtr device = VRDisplay::New();
 
   JNIEnv* env = AttachCurrentThread();
 
   ScopedJavaLocalRef<jstring> j_device_name =
       Java_CardboardVRDevice_getDeviceName(env, j_cardboard_device_.obj());
   device->displayName =
       base::android::ConvertJavaStringToUTF8(env, j_device_name.obj());
 
   ScopedJavaLocalRef<jfloatArray> j_fov(env, env->NewFloatArray(4));
   Java_CardboardVRDevice_getFieldOfView(env, j_cardboard_device_.obj(),
                                         j_fov.obj());
 
   std::vector<float> fov;
   base::android::JavaFloatArrayToFloatVector(env, j_fov.obj(), &fov);
 
-  device->capabilities = blink::mojom::VRDisplayCapabilities::New();
+  device->capabilities = VRDisplayCapabilities::New();
   device->capabilities->hasOrientation = true;
   device->capabilities->hasPosition = false;
   device->capabilities->hasExternalDisplay = false;
   device->capabilities->canPresent = false;
 
-  device->leftEye = blink::mojom::VREyeParameters::New();
-  device->rightEye = blink::mojom::VREyeParameters::New();
-  blink::mojom::VREyeParametersPtr& left_eye = device->leftEye;
-  blink::mojom::VREyeParametersPtr& right_eye = device->rightEye;
+  device->leftEye = VREyeParameters::New();
+  device->rightEye = VREyeParameters::New();
+  VREyeParametersPtr& left_eye = device->leftEye;
+  VREyeParametersPtr& right_eye = device->rightEye;
 
-  left_eye->fieldOfView = blink::mojom::VRFieldOfView::New();
+  left_eye->fieldOfView = VRFieldOfView::New();
   left_eye->fieldOfView->upDegrees = fov[0];
   left_eye->fieldOfView->downDegrees = fov[1];
   left_eye->fieldOfView->leftDegrees = fov[2];
   left_eye->fieldOfView->rightDegrees = fov[3];
 
   // Cardboard devices always assume a mirrored FOV, so this is just the left
   // eye FOV with the left and right degrees swapped.
-  right_eye->fieldOfView = blink::mojom::VRFieldOfView::New();
+  right_eye->fieldOfView = VRFieldOfView::New();
   right_eye->fieldOfView->upDegrees = fov[0];
   right_eye->fieldOfView->downDegrees = fov[1];
   right_eye->fieldOfView->leftDegrees = fov[3];
   right_eye->fieldOfView->rightDegrees = fov[2];
 
   float ipd = Java_CardboardVRDevice_getIpd(env, j_cardboard_device_.obj());
 
   left_eye->offset = mojo::Array<float>::New(3);
   left_eye->offset[0] = ipd * -0.5f;
   left_eye->offset[1] = 0.0f;
@@ skipping 14 matching lines @@
 
   left_eye->renderWidth = screen_size[0] / 2.0;
   left_eye->renderHeight = screen_size[1];
 
   right_eye->renderWidth = screen_size[0] / 2.0;
   right_eye->renderHeight = screen_size[1];
 
   return device;
 }
 
-blink::mojom::VRPosePtr CardboardVRDevice::GetPose() {
+VRPosePtr CardboardVRDevice::GetPose() {
   TRACE_EVENT0("input", "CardboardVRDevice::GetSensorState");
-  blink::mojom::VRPosePtr pose = blink::mojom::VRPose::New();
+  VRPosePtr pose = VRPose::New();
 
   pose->timestamp = base::Time::Now().ToJsTime();
 
   JNIEnv* env = AttachCurrentThread();
   Java_CardboardVRDevice_getSensorState(env, j_cardboard_device_.obj(),
                                         j_head_matrix_.obj());
 
   std::vector<float> head_matrix;
   base::android::JavaFloatArrayToFloatVector(env, j_head_matrix_.obj(),
                                              &head_matrix);
@@ skipping 20 matching lines @@
 
   return pose;
 }
 
 void CardboardVRDevice::ResetPose() {
   Java_CardboardVRDevice_resetSensor(AttachCurrentThread(),
                                      j_cardboard_device_.obj());
 }
 
 }  // namespace device