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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java

Issue 2721293002: Show the Android Location Settings Dialog when sites want permission. (Closed)
Patch Set: Feedback Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java
index 0d43663497aaf09d551ed3796e49522735194103..1cdf3ec8de01712a1549e42b92f40c2bf728857e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java
@@ -49,15 +49,21 @@ public class LocationSettings {
}
@CalledByNative
- private static boolean canSitesRequestLocationPermission(WebContents webContents) {
+ private static boolean hasAndroidLocationPermission() {
+ return LocationUtils.getInstance().hasAndroidLocationPermission();
+ }
+
+ @CalledByNative
+ private static boolean canPromptForAndroidLocationPermission(WebContents webContents) {
WindowAndroid windowAndroid = windowFromWebContents(webContents);
if (windowAndroid == null) return false;
- LocationUtils locationUtils = LocationUtils.getInstance();
- if (!locationUtils.isSystemLocationSettingEnabled()) return false;
+ return windowAndroid.canRequestPermission(Manifest.permission.ACCESS_FINE_LOCATION);
+ }
- return locationUtils.hasAndroidLocationPermission()
- || windowAndroid.canRequestPermission(Manifest.permission.ACCESS_FINE_LOCATION);
+ @CalledByNative
+ private static boolean isSystemLocationSettingEnabled() {
+ return LocationUtils.getInstance().isSystemLocationSettingEnabled();
}
@CalledByNative

Powered by Google App Engine
This is Rietveld 408576698