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

Side by Side Diff: chrome/browser/android/vr_shell/vr_shell_delegate.h

Issue 2784303002: Adds button to VRShell menu mode, which lets the user manually exit WebVR presentation. (Closed)
Patch Set: Fixed closure compiler error Created 3 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 const base::android::JavaParamRef<jobject>& obj, 44 const base::android::JavaParamRef<jobject>& obj,
45 jlong timebase_nanos, 45 jlong timebase_nanos,
46 jdouble interval_seconds); 46 jdouble interval_seconds);
47 void OnPause(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); 47 void OnPause(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
48 void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); 48 void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
49 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); 49 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
50 device::mojom::VRSubmitFrameClientPtr TakeSubmitFrameClient(); 50 device::mojom::VRSubmitFrameClientPtr TakeSubmitFrameClient();
51 51
52 device::GvrDeviceProvider* device_provider() { return device_provider_; } 52 device::GvrDeviceProvider* device_provider() { return device_provider_; }
53 53
54 // device::GvrDelegateProvider implementation.
55 void ExitWebVRPresent() override;
56
54 private: 57 private:
55 // device::GvrDelegateProvider implementation 58 // device::GvrDelegateProvider implementation.
56 void SetDeviceProvider(device::GvrDeviceProvider* device_provider) override; 59 void SetDeviceProvider(device::GvrDeviceProvider* device_provider) override;
57 void ClearDeviceProvider() override; 60 void ClearDeviceProvider() override;
58 void RequestWebVRPresent(device::mojom::VRSubmitFrameClientPtr submit_client, 61 void RequestWebVRPresent(device::mojom::VRSubmitFrameClientPtr submit_client,
59 const base::Callback<void(bool)>& callback) override; 62 const base::Callback<void(bool)>& callback) override;
60 void ExitWebVRPresent() override;
61 device::GvrDelegate* GetDelegate() override; 63 device::GvrDelegate* GetDelegate() override;
62 void SetListeningForActivate(bool listening) override; 64 void SetListeningForActivate(bool listening) override;
63 65
64 void CreateNonPresentingDelegate(); 66 void CreateNonPresentingDelegate();
65 67
66 std::unique_ptr<NonPresentingGvrDelegate> non_presenting_delegate_; 68 std::unique_ptr<NonPresentingGvrDelegate> non_presenting_delegate_;
67 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_delegate_; 69 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_delegate_;
68 device::GvrDeviceProvider* device_provider_ = nullptr; 70 device::GvrDeviceProvider* device_provider_ = nullptr;
69 device::GvrDelegate* delegate_ = nullptr; 71 device::GvrDelegate* delegate_ = nullptr;
70 base::Callback<void(bool)> present_callback_; 72 base::Callback<void(bool)> present_callback_;
71 int64_t timebase_nanos_ = 0; 73 int64_t timebase_nanos_ = 0;
72 double interval_seconds_ = 0; 74 double interval_seconds_ = 0;
73 device::mojom::VRSubmitFrameClientPtr submit_client_; 75 device::mojom::VRSubmitFrameClientPtr submit_client_;
74 76
75 DISALLOW_COPY_AND_ASSIGN(VrShellDelegate); 77 DISALLOW_COPY_AND_ASSIGN(VrShellDelegate);
76 }; 78 };
77 79
78 bool RegisterVrShellDelegate(JNIEnv* env); 80 bool RegisterVrShellDelegate(JNIEnv* env);
79 81
80 } // namespace vr_shell 82 } // namespace vr_shell
81 83
82 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ 84 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell.cc ('k') | chrome/browser/android/vr_shell/vr_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698