device/vr/android/gvr/gvr_device_provider.cc - Issue 2598093002: Update GVR to 1.10.0

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: device/vr/android/gvr/gvr_device_provider.cc

Issue 2598093002: Update GVR to 1.10.0 (Closed)

Patch Set: Created 4 years 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 | « device/vr/android/gvr/gvr_device.cc ('k') | device/vr/android/gvr/gvr_gamepad_data_fetcher.h » ('j') | no next file with comments »

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 #include "device/vr/android/gvr/gvr_device_provider.h"	5 #include "device/vr/android/gvr/gvr_device_provider.h"

6	6

7 #include <jni.h>	7 #include <jni.h>

8	8

9 #include "base/android/context_utils.h"	9 #include "base/android/context_utils.h"

10 #include "base/android/jni_android.h"	10 #include "base/android/jni_android.h"

11 #include "base/android/jni_utils.h"	11 #include "base/android/jni_utils.h"

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

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

14 #include "device/vr/android/gvr/gvr_device.h"	14 #include "device/vr/android/gvr/gvr_device.h"

15 #include "device/vr/android/gvr/gvr_gamepad_data_fetcher.h"	15 #include "device/vr/android/gvr/gvr_gamepad_data_fetcher.h"

16 #include "device/vr/vr_device.h"	16 #include "device/vr/vr_device.h"

17 #include "device/vr/vr_device_manager.h"	17 #include "device/vr/vr_device_manager.h"

18 #include "device/vr/vr_service.mojom.h"	18 #include "device/vr/vr_service.mojom.h"

19 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"	19 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/ gvr.h"

20 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_co ntroller.h"	20 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/ gvr_controller.h"

21 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_ty pes.h"	21 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/ gvr_types.h"

22	22

23 using base::android::AttachCurrentThread;	23 using base::android::AttachCurrentThread;

24 using base::android::GetApplicationContext;	24 using base::android::GetApplicationContext;

25	25

26 namespace device {	26 namespace device {

27	27

28 GvrDeviceProvider::GvrDeviceProvider() {}	28 GvrDeviceProvider::GvrDeviceProvider() {}

29	29

30 GvrDeviceProvider::~GvrDeviceProvider() {	30 GvrDeviceProvider::~GvrDeviceProvider() {

31 GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory(	31 GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory(

(...skipping 105 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
137 void GvrDeviceProvider::SetListeningForActivate(bool listening) {	137 void GvrDeviceProvider::SetListeningForActivate(bool listening) {

138 device::GvrDelegateProvider* delegate_provider =	138 device::GvrDelegateProvider* delegate_provider =

139 device::GvrDelegateProvider::GetInstance();	139 device::GvrDelegateProvider::GetInstance();

140 if (!delegate_provider)	140 if (!delegate_provider)

141 return;	141 return;

142	142

143 delegate_provider->SetListeningForActivate(listening);	143 delegate_provider->SetListeningForActivate(listening);

144 }	144 }

145	145

146 } // namespace device	146 } // namespace device

OLD	NEW