chrome/browser/android/vr_shell/vr_shell.h - Issue 2367673002: Updated to GVR 1.0 SDK

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2367673002: Updated to GVR 1.0 SDK (Closed)

Patch Set: Prevent doubling up on neck modeling in VrShell 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

OLD	NEW
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 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_	5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_

6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_	6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_

7	7

8 #include <jni.h>	8 #include <jni.h>

9 #include <memory>	9 #include <memory>

10 #include <vector>	10 #include <vector>

11	11

12 #include "base/android/jni_weak_ref.h"	12 #include "base/android/jni_weak_ref.h"

13 #include "base/macros.h"	13 #include "base/macros.h"

14 #include "chrome/browser/android/vr_shell/ui_elements.h"	14 #include "chrome/browser/android/vr_shell/ui_elements.h"

15 #include "chrome/browser/android/vr_shell/ui_scene.h"	15 #include "chrome/browser/android/vr_shell/ui_scene.h"

16 #include "device/vr/android/gvr/gvr_delegate.h"	16 #include "device/vr/android/gvr/gvr_delegate.h"

17 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g vr.h"	17 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"

18 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g vr_types.h"	18 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_ty pes.h"

19	19

20 namespace content {	20 namespace content {

21 class ContentViewCore;	21 class ContentViewCore;

22 }	22 }

23	23

24 namespace ui {	24 namespace ui {

25 class WindowAndroid;	25 class WindowAndroid;

26 }	26 }

27	27

28 namespace vr_shell {	28 namespace vr_shell {

(...skipping 94 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
123 bool webvr_mode_ = false;	123 bool webvr_mode_ = false;

124	124

125 DISALLOW_COPY_AND_ASSIGN(VrShell);	125 DISALLOW_COPY_AND_ASSIGN(VrShell);

126 };	126 };

127	127

128 bool RegisterVrShell(JNIEnv* env);	128 bool RegisterVrShell(JNIEnv* env);

129	129

130 } // namespace vr_shell	130 } // namespace vr_shell

131	131

132 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_	132 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_

OLD	NEW

« no previous file with comments | « chrome/browser/android/vr_shell/vr_math.cc ('k') | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | chrome/browser/android/vr_shell/vr_shell.cc » ('J')