Index: chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java |
index 5d96a611012f88400b9c454ec04e1f655eac9fe5..3483a645626c69f58936686326bf4dde328c5443 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java |
@@ -18,7 +18,6 @@ |
import org.chromium.chrome.R; |
import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer; |
import org.chromium.chrome.browser.profiles.Profile; |
-import org.chromium.components.location.LocationUtils; |
import org.chromium.ui.base.WindowAndroid; |
import org.chromium.ui.text.NoUnderlineClickableSpan; |
import org.chromium.ui.text.SpanApplier; |
@@ -162,7 +161,8 @@ |
} |
private void checkLocationPermission() { |
- if (LocationUtils.getInstance().hasAndroidLocationPermission(mActivity)) { |
+ if (mWindowAndroid.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION) |
+ || mWindowAndroid.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) { |
return; |
} |
@@ -255,8 +255,8 @@ |
@CalledByNative |
private static BluetoothChooserDialog create(WindowAndroid windowAndroid, String origin, |
int securityLevel, long nativeBluetoothChooserDialogPtr) { |
- if (!LocationUtils.getInstance().hasAndroidLocationPermission( |
- windowAndroid.getActivity().get()) |
+ if (!windowAndroid.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION) |
+ && !windowAndroid.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION) |
&& !windowAndroid.canRequestPermission( |
Manifest.permission.ACCESS_COARSE_LOCATION)) { |
// If we can't even ask for enough permission to scan for Bluetooth devices, don't open |