Implement controller handling in vr_shell.cc

chrome/browser/android/vr_shell/vr_shell.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
 
 #include <jni.h>
 #include <memory>
 #include <vector>
@@ skipping 12 matching lines @@
 class ContentViewCore;
 }
 
 namespace ui {
 class WindowAndroid;
 }
 
 namespace vr_shell {
 
 class VrCompositor;
+class VrController;
+class VrInputManager;
 class VrShellDelegate;
 class VrShellRenderer;
+struct VrGesture;
+
 
 class VrShell : public device::GvrDelegate {
  public:
   VrShell(JNIEnv* env, jobject obj,
           content::ContentViewCore* content_cvc,
           ui::WindowAndroid* content_window,
           content::ContentViewCore* ui_cvc,
           ui::WindowAndroid* ui_window);
 
   void UpdateCompositorLayers(JNIEnv* env,
@@ skipping 94 matching lines @@
   base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_;
 
   gvr::Quatf controller_quat_;
   bool controller_active_ = false;
 
   gvr::Vec3f target_point_;
   const ContentRectangle* target_element_ = nullptr;
   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 target_point_ and related.

[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);
 };
 
 bool RegisterVrShell(JNIEnv* env);
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_