Chromium Code Reviews| 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..ef5eff60de625f8c93e61be1f092bf51020fcf96 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: |
| @@ -146,9 +150,15 @@ class VrShell : public device::GvrDelegate { |
| int ui_tex_width_ = 0; |
| int ui_tex_height_ = 0; |
| + int current_ui_rect_ = -1; |
|
cjgrant
2016/09/30 20:26:39
nit: In ToT, this would be at home alongside targe
mthiesse
2016/10/03 16:30:13
Done.
|
| + |
| 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); |