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

Unified Diff: chrome/browser/android/vr_shell/vr_shell_delegate.h

Issue 2865463003: Tracks GVR version crossed with headset type using UMA. (Closed)
Patch Set: Nit: moved fallthrough comment out of else-block Created 3 years, 7 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
Index: chrome/browser/android/vr_shell/vr_shell_delegate.h
diff --git a/chrome/browser/android/vr_shell/vr_shell_delegate.h b/chrome/browser/android/vr_shell/vr_shell_delegate.h
index ba1937b649caba70e5ffd6314e0728683f9a3fec..a3181c0aa943be712ddc6151eb857ee9014233c2 100644
--- a/chrome/browser/android/vr_shell/vr_shell_delegate.h
+++ b/chrome/browser/android/vr_shell/vr_shell_delegate.h
@@ -12,6 +12,8 @@
#include "base/android/jni_weak_ref.h"
#include "base/callback.h"
#include "base/macros.h"
+#include "chrome/browser/android/vr_shell/vr_core_info.h"
+#include "chrome/browser/android/vr_shell/vr_usage_monitor.h"
#include "device/vr/android/gvr/gvr_delegate_provider.h"
#include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
@@ -65,11 +67,11 @@ class VrShellDelegate : public device::GvrDelegateProvider {
const base::Callback<void(bool)>& callback) override;
device::GvrDelegate* GetDelegate() override;
void SetListeningForActivate(bool listening) override;
-
void CreateNonPresentingDelegate();
-
void OnActivateDisplayHandled(bool present_requested);
+ std::unique_ptr<VrCoreInfo> MakeVrCoreInfo(JNIEnv* env);
+
std::unique_ptr<NonPresentingGvrDelegate> non_presenting_delegate_;
base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_delegate_;
device::GvrDeviceProvider* device_provider_ = nullptr;

Powered by Google App Engine
This is Rietveld 408576698