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

Side by Side Diff: chrome/browser/android/vr_shell/vr_shell.cc

Issue 2392943005: Fix Cardboard trigger (broken by GVR update) (Closed)
Patch Set: Address comment Created 4 years, 2 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
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/android/vr_shell/vr_shell.h" 5 #include "chrome/browser/android/vr_shell/vr_shell.h"
6 6
7 #include "chrome/browser/android/vr_shell/ui_elements.h" 7 #include "chrome/browser/android/vr_shell/ui_elements.h"
8 #include "chrome/browser/android/vr_shell/ui_scene.h" 8 #include "chrome/browser/android/vr_shell/ui_scene.h"
9 #include "chrome/browser/android/vr_shell/vr_compositor.h" 9 #include "chrome/browser/android/vr_shell/vr_compositor.h"
10 #include "chrome/browser/android/vr_shell/vr_controller.h" 10 #include "chrome/browser/android/vr_shell/vr_controller.h"
11 #include "chrome/browser/android/vr_shell/vr_gesture.h" 11 #include "chrome/browser/android/vr_shell/vr_gesture.h"
12 #include "chrome/browser/android/vr_shell/vr_gl_util.h" 12 #include "chrome/browser/android/vr_shell/vr_gl_util.h"
13 #include "chrome/browser/android/vr_shell/vr_input_manager.h" 13 #include "chrome/browser/android/vr_shell/vr_input_manager.h"
14 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h" 14 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h"
15 #include "chrome/browser/android/vr_shell/vr_shell_renderer.h" 15 #include "chrome/browser/android/vr_shell/vr_shell_renderer.h"
16 #include "content/public/browser/navigation_controller.h" 16 #include "content/public/browser/navigation_controller.h"
17 #include "content/public/browser/render_widget_host.h" 17 #include "content/public/browser/render_widget_host.h"
18 #include "content/public/browser/render_widget_host_view.h" 18 #include "content/public/browser/render_widget_host_view.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "content/public/common/referrer.h" 20 #include "content/public/common/referrer.h"
21 #include "content/public/common/screen_info.h" 21 #include "content/public/common/screen_info.h"
22
23 #include "jni/VrShell_jni.h" 22 #include "jni/VrShell_jni.h"
24 #include "third_party/WebKit/public/web/WebInputEvent.h" 23 #include "third_party/WebKit/public/web/WebInputEvent.h"
25 #include "ui/android/view_android.h" 24 #include "ui/android/view_android.h"
26 #include "ui/android/window_android.h" 25 #include "ui/android/window_android.h"
27 #include "ui/base/page_transition_types.h" 26 #include "ui/base/page_transition_types.h"
28 #include "ui/gl/gl_bindings.h" 27 #include "ui/gl/gl_bindings.h"
29 #include "ui/gl/init/gl_factory.h" 28 #include "ui/gl/init/gl_factory.h"
30 29
31 using base::android::JavaParamRef; 30 using base::android::JavaParamRef;
32 31
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 const JavaParamRef<jobject>& ui_web_contents, 841 const JavaParamRef<jobject>& ui_web_contents,
843 jlong ui_window_android) { 842 jlong ui_window_android) {
844 return reinterpret_cast<intptr_t>(new VrShell( 843 return reinterpret_cast<intptr_t>(new VrShell(
845 env, obj, content::WebContents::FromJavaWebContents(content_web_contents), 844 env, obj, content::WebContents::FromJavaWebContents(content_web_contents),
846 reinterpret_cast<ui::WindowAndroid*>(content_window_android), 845 reinterpret_cast<ui::WindowAndroid*>(content_window_android),
847 content::WebContents::FromJavaWebContents(ui_web_contents), 846 content::WebContents::FromJavaWebContents(ui_web_contents),
848 reinterpret_cast<ui::WindowAndroid*>(ui_window_android))); 847 reinterpret_cast<ui::WindowAndroid*>(ui_window_android)));
849 } 848 }
850 849
851 } // namespace vr_shell 850 } // namespace vr_shell
OLDNEW
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698