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

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

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/location_settings_impl.h" 5 #include "chrome/browser/android/location_settings_impl.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "content/public/browser/web_contents.h" 8 #include "content/public/browser/web_contents.h"
9 #if !defined(USE_AURA)
9 #include "jni/LocationSettings_jni.h" 10 #include "jni/LocationSettings_jni.h"
11 #endif
10 12
11 using base::android::AttachCurrentThread; 13 using base::android::AttachCurrentThread;
12 14
13 LocationSettingsImpl::LocationSettingsImpl() {} 15 LocationSettingsImpl::LocationSettingsImpl() {}
14 16
15 LocationSettingsImpl::~LocationSettingsImpl() {} 17 LocationSettingsImpl::~LocationSettingsImpl() {}
16 18
17 bool LocationSettingsImpl::CanSitesRequestLocationPermission( 19 bool LocationSettingsImpl::CanSitesRequestLocationPermission(
18 content::WebContents* web_contents) { 20 content::WebContents* web_contents) {
21 #if !defined(USE_AURA)
19 JNIEnv* env = AttachCurrentThread(); 22 JNIEnv* env = AttachCurrentThread();
20 return Java_LocationSettings_canSitesRequestLocationPermission( 23 return Java_LocationSettings_canSitesRequestLocationPermission(
21 env, web_contents->GetJavaWebContents().obj()); 24 env, web_contents->GetJavaWebContents().obj());
25 #else
26 return false;
27 #endif
22 } 28 }
23 29
24 // Register native methods 30 // Register native methods
25 31
26 bool LocationSettingsImpl::Register(JNIEnv* env) { 32 bool LocationSettingsImpl::Register(JNIEnv* env) {
33 #if !defined(USE_AURA)
27 return RegisterNativesImpl(env); 34 return RegisterNativesImpl(env);
35 #else
36 return true;
37 #endif
28 } 38 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698