| 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 ef729cd5ae611a3c157f561830fa803914812594..a24827a82677fdca2128c01d0c9de2b83e44468b 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
|
| @@ -48,15 +48,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
|
|
|