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

Side by Side Diff: device/vr/android/gvr/gvr_device_provider.cc

Issue 2847523002: Android: Remove GetApplicationContext part 4 (Closed)
Patch Set: fix cronet Created 3 years, 7 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
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 "device/vr/android/gvr/gvr_device_provider.h" 5 #include "device/vr/android/gvr/gvr_device_provider.h"
6 6
7 #include <jni.h>
mthiesse 2017/05/04 14:30:07 This looks unintentional, did you mean to add thes
Peter Wen 2017/05/04 14:36:10 Thanks, not sure how these got here.
agrieve 2017/05/04 15:55:50 Are these really newly required?
Peter Wen 2017/05/04 17:39:26 Removed.
8
9 #include "base/android/jni_android.h"
10 #include "base/android/jni_utils.h"
11 #include "base/android/scoped_java_ref.h"
7 #include "device/vr/android/gvr/gvr_delegate_provider.h" 12 #include "device/vr/android/gvr/gvr_delegate_provider.h"
8 #include "device/vr/android/gvr/gvr_device.h" 13 #include "device/vr/android/gvr/gvr_device.h"
9 #include "device/vr/vr_device.h" 14 #include "device/vr/vr_device.h"
10 15
11 namespace device { 16 namespace device {
12 17
13 GvrDeviceProvider::GvrDeviceProvider() 18 GvrDeviceProvider::GvrDeviceProvider()
14 : vr_device_(base::MakeUnique<GvrDevice>(this)) {} 19 : vr_device_(base::MakeUnique<GvrDevice>(this)) {}
15 20
16 GvrDeviceProvider::~GvrDeviceProvider() { 21 GvrDeviceProvider::~GvrDeviceProvider() {
(...skipping 26 matching lines...) Expand all
43 48
44 void GvrDeviceProvider::SetListeningForActivate(bool listening) { 49 void GvrDeviceProvider::SetListeningForActivate(bool listening) {
45 GvrDelegateProvider* delegate_provider = GetDelegateProvider(); 50 GvrDelegateProvider* delegate_provider = GetDelegateProvider();
46 if (!delegate_provider) 51 if (!delegate_provider)
47 return; 52 return;
48 53
49 delegate_provider->SetListeningForActivate(listening); 54 delegate_provider->SetListeningForActivate(listening);
50 } 55 }
51 56
52 } // namespace device 57 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698