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

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

Issue 2510873003: Clean up WebVR RequestPresent and make callback asynchronous. (Closed)
Patch Set: Address comments Created 4 years, 1 month 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 "base/android/jni_weak_ref.h" 10 #include "base/android/jni_weak_ref.h"
(...skipping 10 matching lines...) Expand all
21 21
22 class VrShellDelegate : public device::GvrDelegateProvider { 22 class VrShellDelegate : public device::GvrDelegateProvider {
23 public: 23 public:
24 VrShellDelegate(JNIEnv* env, jobject obj); 24 VrShellDelegate(JNIEnv* env, jobject obj);
25 virtual ~VrShellDelegate(); 25 virtual ~VrShellDelegate();
26 26
27 static VrShellDelegate* GetNativeDelegate(JNIEnv* env, jobject jdelegate); 27 static VrShellDelegate* GetNativeDelegate(JNIEnv* env, jobject jdelegate);
28 28
29 base::WeakPtr<device::GvrDeviceProvider> GetDeviceProvider(); 29 base::WeakPtr<device::GvrDeviceProvider> GetDeviceProvider();
30 30
31 // Called by the Java VrShellDelegate. Returns true if the GvrDeviceProvider 31 // Called by the Java VrShellDelegate.
32 // needs to handle shutdown first.
33 void ExitWebVRIfNecessary(JNIEnv* env, jobject obj); 32 void ExitWebVRIfNecessary(JNIEnv* env, jobject obj);
34 33
34 void SetPresentResult(JNIEnv* env, jobject obj, jboolean result);
35
35 // device::GvrDelegateProvider implementation 36 // device::GvrDelegateProvider implementation
36 bool RequestWebVRPresent( 37 void RequestWebVRPresent(
37 base::WeakPtr<device::GvrDeviceProvider> device_provider) override; 38 base::WeakPtr<device::GvrDeviceProvider> device_provider,
39 const base::Callback<void(bool)>& callback) override;
38 void ExitWebVRPresent() override; 40 void ExitWebVRPresent() override;
39 base::WeakPtr<device::GvrDelegate> GetNonPresentingDelegate() override; 41 base::WeakPtr<device::GvrDelegate> GetNonPresentingDelegate() override;
40 void DestroyNonPresentingDelegate() override; 42 void DestroyNonPresentingDelegate() override;
41 43
42 private: 44 private:
43 std::unique_ptr<device::GvrDelegate> non_presenting_delegate_; 45 std::unique_ptr<device::GvrDelegate> non_presenting_delegate_;
44 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_delegate_; 46 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_delegate_;
45 base::WeakPtr<device::GvrDeviceProvider> device_provider_; 47 base::WeakPtr<device::GvrDeviceProvider> device_provider_;
48 base::Callback<void(bool)> present_callback_;
46 49
47 DISALLOW_COPY_AND_ASSIGN(VrShellDelegate); 50 DISALLOW_COPY_AND_ASSIGN(VrShellDelegate);
48 }; 51 };
49 52
50 bool RegisterVrShellDelegate(JNIEnv* env); 53 bool RegisterVrShellDelegate(JNIEnv* env);
51 54
52 } // namespace vr_shell 55 } // namespace vr_shell
53 56
54 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ 57 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698