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

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

Issue 2874103003: Revert of 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 // VrBrowserInterface implementation (VrShellGl calling to UI and VrShell). 44 // VrBrowserInterface implementation (VrShellGl calling to UI and VrShell).
45 void ContentSurfaceChanged(jobject surface) override; 45 void ContentSurfaceChanged(jobject surface) override;
46 void GvrDelegateReady() override; 46 void GvrDelegateReady() override;
47 void UpdateGamepadData(device::GvrGamepadData) override; 47 void UpdateGamepadData(device::GvrGamepadData) override;
48 void AppButtonClicked() override; 48 void AppButtonClicked() override;
49 void AppButtonGesturePerformed(UiInterface::Direction direction) override; 49 void AppButtonGesturePerformed(UiInterface::Direction direction) override;
50 void ProcessContentGesture( 50 void ProcessContentGesture(
51 std::unique_ptr<blink::WebInputEvent> event) override; 51 std::unique_ptr<blink::WebInputEvent> event) override;
52 void ForceExitVr() override; 52 void ForceExitVr() override;
53 void ExitPresent() override;
54 void RunVRDisplayInfoCallback( 53 void RunVRDisplayInfoCallback(
55 const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback, 54 const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
56 device::mojom::VRDisplayInfoPtr* info) override; 55 device::mojom::VRDisplayInfoPtr* info) override;
57 void OnContentPaused(bool enabled) override; 56 void OnContentPaused(bool enabled) override;
58 void NavigateBack() override; 57 void NavigateBack() override;
59 58
60 // UiInterface implementation (VrShell calling to the UI). 59 // UiInterface implementation (VrShell calling to the UI).
61 void SetFullscreen(bool enabled) override; 60 void SetFullscreen(bool enabled) override;
62 void SetHistoryButtonsEnabled(bool can_go_back, bool can_go_forward) override; 61 void SetHistoryButtonsEnabled(bool can_go_back, bool can_go_forward) override;
63 void SetLoadProgress(double progress) override; 62 void SetLoadProgress(double progress) override;
(...skipping 22 matching lines...) Expand all
86 bool initially_web_vr_; 85 bool initially_web_vr_;
87 bool in_cct_; 86 bool in_cct_;
88 bool reprojected_rendering_; 87 bool reprojected_rendering_;
89 88
90 DISALLOW_COPY_AND_ASSIGN(VrGLThread); 89 DISALLOW_COPY_AND_ASSIGN(VrGLThread);
91 }; 90 };
92 91
93 } // namespace vr_shell 92 } // namespace vr_shell
94 93
95 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_THREAD_H_ 94 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_GL_THREAD_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/vr_browser_interface.h ('k') | chrome/browser/android/vr_shell/vr_gl_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698