NOT FOR REVIEW: Aura on Android

chrome/browser/android/location_settings_impl.cc

Index: chrome/browser/android/location_settings_impl.cc
diff --git a/chrome/browser/android/location_settings_impl.cc b/chrome/browser/android/location_settings_impl.cc
index 93d19f547627c5bac19051897be97ddcbc819e26..85c010342649178589bcc8eece3c75564dd5f89b 100644
--- a/chrome/browser/android/location_settings_impl.cc
+++ b/chrome/browser/android/location_settings_impl.cc
@@ -6,7 +6,9 @@
 
 #include "base/android/jni_android.h"
 #include "content/public/browser/web_contents.h"
+#if !defined(USE_AURA)
 #include "jni/LocationSettings_jni.h"
+#endif
 
 using base::android::AttachCurrentThread;
 
@@ -16,13 +18,21 @@ LocationSettingsImpl::~LocationSettingsImpl() {}
 
 bool LocationSettingsImpl::CanSitesRequestLocationPermission(
     content::WebContents* web_contents) {
+#if !defined(USE_AURA)
   JNIEnv* env = AttachCurrentThread();
   return Java_LocationSettings_canSitesRequestLocationPermission(
       env, web_contents->GetJavaWebContents().obj());
+#else
+  return false;
+#endif
 }
 
 // Register native methods
 
 bool LocationSettingsImpl::Register(JNIEnv* env) {
+#if !defined(USE_AURA)
   return RegisterNativesImpl(env);
+#else
+  return true;
+#endif
 }