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

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

Issue 2867783002: App button click exits WebVR presentation. (Closed)
Patch Set: 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 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_GL_THREAD_H_ 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_THREAD_H_
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_THREAD_H_ 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_THREAD_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 27 matching lines...) Expand all
38 38
39 // VrBrowserInterface implementation. 39 // VrBrowserInterface implementation.
40 void ContentSurfaceChanged(jobject surface) override; 40 void ContentSurfaceChanged(jobject surface) override;
41 void GvrDelegateReady() override; 41 void GvrDelegateReady() override;
42 void UpdateGamepadData(device::GvrGamepadData) override; 42 void UpdateGamepadData(device::GvrGamepadData) override;
43 void AppButtonGesturePerformed(UiInterface::Direction direction) override; 43 void AppButtonGesturePerformed(UiInterface::Direction direction) override;
44 void OnAppButtonClicked() override; 44 void OnAppButtonClicked() override;
45 void ProcessContentGesture( 45 void ProcessContentGesture(
46 std::unique_ptr<blink::WebInputEvent> event) override; 46 std::unique_ptr<blink::WebInputEvent> event) override;
47 void ForceExitVr() override; 47 void ForceExitVr() override;
48 void ExitPresent() override;
48 void RunVRDisplayInfoCallback( 49 void RunVRDisplayInfoCallback(
49 const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback, 50 const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
50 device::mojom::VRDisplayInfoPtr* info) override; 51 device::mojom::VRDisplayInfoPtr* info) override;
51 void OnContentPaused(bool enabled) override; 52 void OnContentPaused(bool enabled) override;
52 53
53 protected: 54 protected:
54 void Init() override; 55 void Init() override;
55 void CleanUp() override; 56 void CleanUp() override;
56 57
57 private: 58 private:
(...skipping 10 matching lines...) Expand all
68 gvr_context* gvr_api_; 69 gvr_context* gvr_api_;
69 bool initially_web_vr_; 70 bool initially_web_vr_;
70 bool reprojected_rendering_; 71 bool reprojected_rendering_;
71 72
72 DISALLOW_COPY_AND_ASSIGN(VrGLThread); 73 DISALLOW_COPY_AND_ASSIGN(VrGLThread);
73 }; 74 };
74 75
75 } // namespace vr_shell 76 } // namespace vr_shell
76 77
77 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_THREAD_H_ 78 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_THREAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698