Updated ResetPose logic for GVR devices

device/vr/android/gvr/gvr_device.cc

 // Copyright 2016 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/gvr/gvr_device.h"
 
 #include <math.h>
 #include <algorithm>
 
 #include "base/time/time.h"
@@ skipping 170 matching lines @@
 
   // Save the underlying GVR pose for use by rendering. It can't use a
   // VRPosePtr since that's a different data type.
   delegate_->SetGvrPoseForWebVr(head_mat, pose_index_);
 
   return pose;
 }
 
 void GvrDevice::ResetPose() {
   gvr::GvrApi* gvr_api = GetGvrApi();
-  if (gvr_api)
-    gvr_api->ResetTracking();
+
+  // Should never call RecenterTracking when using with Daydream viewers. On
+  // those devices recentering should only be done via the controller.
+  if (gvr_api && gvr_api->GetViewerType() == GVR_VIEWER_TYPE_CARDBOARD)
+    gvr_api->RecenterTracking();
 }
 
 bool GvrDevice::RequestPresent(bool secure_origin) {
   secure_origin_ = secure_origin;
   if (delegate_)
     delegate_->SetWebVRSecureOrigin(secure_origin_);
   return gvr_provider_->RequestPresent();
 }
 
 void GvrDevice::ExitPresent() {
@@ skipping 29 matching lines @@
 }
 
 gvr::GvrApi* GvrDevice::GetGvrApi() {
   if (!delegate_)
     return nullptr;
 
   return delegate_->gvr_api();
 }
 
 }  // namespace device