chrome/browser/android/vr_shell/ui_elements.h - Issue 2377763003: Revert "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/ui_elements.h

Issue 2377763003: Revert "Updated to GVR 1.0 SDK" (Closed)

Patch Set: 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_UI_ELEMENTS_H_	5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_H_

6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_H_	6 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_H_

7	7

8 #include <cmath>	8 #include <cmath>

9 #include <vector>	9 #include <vector>

10	10

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "chrome/browser/android/vr_shell/vr_math.h"	12 #include "chrome/browser/android/vr_shell/vr_math.h"

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

14	14

15 namespace vr_shell {	15 namespace vr_shell {

16	16

17 class Animation;	17 class Animation;

18	18

19 enum XAnchoring {	19 enum XAnchoring {

20 XNONE = 0,	20 XNONE = 0,

21 XLEFT,	21 XLEFT,

22 XRIGHT	22 XRIGHT

23 };	23 };

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
98 // Animations that affect the properties of the object over time.	98 // Animations that affect the properties of the object over time.

99 std::vector<std::unique_ptr<Animation>> animations;	99 std::vector<std::unique_ptr<Animation>> animations;

100	100

101 private:	101 private:

102 DISALLOW_COPY_AND_ASSIGN(ContentRectangle);	102 DISALLOW_COPY_AND_ASSIGN(ContentRectangle);

103 };	103 };

104	104

105 } // namespace vr_shell	105 } // namespace vr_shell

106	106

107 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_H_	107 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_H_

OLD	NEW

« no previous file with comments | « DEPS ('k') | chrome/browser/android/vr_shell/vr_gl_util.h » ('j') | no next file with comments »