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

Unified Diff: chrome/browser/android/vr_shell/vr_shell.h

Issue 2694103006: Inject vr controller events into Android Native UI. (Closed)
Patch Set: Fix presubmit Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/vr_shell/vr_controller.cc ('k') | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c168e9aea5b937721ed568b980cbf4563f78321c..b887d507962ac933825e72fdb61c8cbb94f1a8e3 100644
--- a/chrome/browser/android/vr_shell/vr_shell.h
+++ b/chrome/browser/android/vr_shell/vr_shell.h
@@ -38,6 +38,7 @@ class WindowAndroid;
namespace vr_shell {
+class AndroidUiGestureTarget;
class UiInterface;
class VrCompositor;
class VrGLThread;
@@ -74,9 +75,11 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
VrShellDelegate* delegate,
gvr_context* gvr_api,
bool reprojected_rendering);
- void SwapContents(JNIEnv* env,
- const base::android::JavaParamRef<jobject>& obj,
- const base::android::JavaParamRef<jobject>& web_contents);
+ void SwapContents(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ const base::android::JavaParamRef<jobject>& web_contents,
+ const base::android::JavaParamRef<jobject>& touch_event_synthesizer);
void LoadUIContent(JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj);
void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
@@ -204,6 +207,7 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
bool webvr_mode_ = false;
content::WebContents* main_contents_ = nullptr;
+ base::android::ScopedJavaGlobalRef<jobject> j_motion_event_synthesizer_;
ui::WindowAndroid* content_window_;
std::unique_ptr<VrCompositor> content_compositor_;
content::WebContents* ui_contents_;
@@ -215,6 +219,7 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_;
std::unique_ptr<VrInputManager> content_input_manager_;
+ std::unique_ptr<AndroidUiGestureTarget> android_ui_gesture_target_;
std::unique_ptr<VrInputManager> ui_input_manager_;
std::unique_ptr<VrMetricsHelper> metrics_helper_;
« no previous file with comments | « chrome/browser/android/vr_shell/vr_controller.cc ('k') | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698