Index: chrome/browser/android/vr_shell/vr_shell_gl.cc |
diff --git a/chrome/browser/android/vr_shell/vr_shell_gl.cc b/chrome/browser/android/vr_shell/vr_shell_gl.cc |
index 5d013199042033fef8c551a80e37eb793a622dbb..982569d9780b6d91825605945b1217a0abd9608e 100644 |
--- a/chrome/browser/android/vr_shell/vr_shell_gl.cc |
+++ b/chrome/browser/android/vr_shell/vr_shell_gl.cc |
@@ -23,6 +23,7 @@ |
#include "chrome/browser/android/vr_shell/vr_gl_util.h" |
#include "chrome/browser/android/vr_shell/vr_shell.h" |
#include "chrome/browser/android/vr_shell/vr_shell_renderer.h" |
+#include "chrome/browser/android/vr_shell/vr_usage_monitor.h" |
#include "device/vr/android/gvr/gvr_delegate.h" |
#include "device/vr/android/gvr/gvr_device.h" |
#include "device/vr/android/gvr/gvr_gamepad_data_provider.h" |
@@ -149,13 +150,6 @@ std::unique_ptr<blink::WebMouseEvent> MakeMouseEvent(WebInputEvent::Type type, |
return mouse_event; |
} |
-enum class ViewerType { |
- UNKNOWN_TYPE = 0, |
- CARDBOARD = 1, |
- DAYDREAM = 2, |
- VIEWER_TYPE_MAX, |
-}; |
- |
void RunVRDisplayInfoCallback( |
const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback, |
device::mojom::VRDisplayInfoPtr info) { |
@@ -412,21 +406,7 @@ void VrShellGl::GvrInit(gvr_context* gvr_api) { |
gvr_api_ = gvr::GvrApi::WrapNonOwned(gvr_api); |
controller_.reset(new VrController(gvr_api)); |
- ViewerType viewerType; |
- switch (gvr_api_->GetViewerType()) { |
- case gvr::ViewerType::GVR_VIEWER_TYPE_DAYDREAM: |
- viewerType = ViewerType::DAYDREAM; |
- break; |
- case gvr::ViewerType::GVR_VIEWER_TYPE_CARDBOARD: |
- viewerType = ViewerType::CARDBOARD; |
- break; |
- default: |
- NOTREACHED(); |
- viewerType = ViewerType::UNKNOWN_TYPE; |
- break; |
- } |
- UMA_HISTOGRAM_ENUMERATION("VRViewerType", static_cast<int>(viewerType), |
- static_cast<int>(ViewerType::VIEWER_TYPE_MAX)); |
+ VrMetricsHelper::LogVrViewerType(gvr_api); |
billorr
2017/05/05 17:48:40
VrMetricsHelper doesn't need to be the only thing
tiborg
2017/05/05 19:03:34
Agreed. I was moving the function to VrMetricsHelp
|
} |
void VrShellGl::InitializeRenderer() { |