| Index: chrome/browser/android/vr_shell/vr_shell.h
|
| diff --git a/chrome/browser/android/vr_shell/vr_shell.h b/chrome/browser/android/vr_shell/vr_shell.h
|
| index c834ed043772a3c444e3819282f49d400f558cf1..c59d269565b87fe4f182dd584afb2a110dd166c1 100644
|
| --- a/chrome/browser/android/vr_shell/vr_shell.h
|
| +++ b/chrome/browser/android/vr_shell/vr_shell.h
|
| @@ -30,8 +30,12 @@ class WindowAndroid;
|
| namespace vr_shell {
|
|
|
| class VrCompositor;
|
| +class VrController;
|
| +class VrInputManager;
|
| class VrShellDelegate;
|
| class VrShellRenderer;
|
| +struct VrGesture;
|
| +
|
|
|
| class VrShell : public device::GvrDelegate {
|
| public:
|
| @@ -139,16 +143,20 @@ class VrShell : public device::GvrDelegate {
|
| base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_;
|
|
|
| gvr::Quatf controller_quat_;
|
| - bool controller_active_ = false;
|
|
|
| gvr::Vec3f target_point_;
|
| const ContentRectangle* target_element_ = nullptr;
|
| + VrInputManager* current_input_target_ = nullptr;
|
| int ui_tex_width_ = 0;
|
| int ui_tex_height_ = 0;
|
|
|
| bool webvr_mode_ = false;
|
| bool webvr_secure_origin_ = false;
|
|
|
| + std::unique_ptr<VrController> controller_;
|
| + scoped_refptr<VrInputManager> content_input_manager_;
|
| + scoped_refptr<VrInputManager> ui_input_manager_;
|
| +
|
| base::WeakPtrFactory<VrShell> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(VrShell);
|
|
|