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

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

Issue 2038753004: Add a LocationUtils class to give all Chromium Android code access to location helpers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Remove some methods from LocationSettings. Created 4 years, 6 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/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 3483a645626c69f58936686326bf4dde328c5443..62702d92780684c542a161eacc63d98688af11b1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java
@@ -13,6 +13,7 @@ import android.text.SpannableString;
import android.text.TextUtils;
import android.view.View;
+import org.chromium.base.LocationUtils;
import org.chromium.base.VisibleForTesting;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.chrome.R;
@@ -161,8 +162,7 @@ public class BluetoothChooserDialog
}
private void checkLocationPermission() {
- if (mWindowAndroid.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
- || mWindowAndroid.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
+ if (LocationUtils.getInstance().chromiumHasLocationPermission(mActivity)) {
return;
}
@@ -255,8 +255,8 @@ public class BluetoothChooserDialog
@CalledByNative
private static BluetoothChooserDialog create(WindowAndroid windowAndroid, String origin,
int securityLevel, long nativeBluetoothChooserDialogPtr) {
- if (!windowAndroid.hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
- && !windowAndroid.hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)
+ if (!LocationUtils.getInstance().chromiumHasLocationPermission(
+ windowAndroid.getActivity().get())
&& !windowAndroid.canRequestPermission(
Manifest.permission.ACCESS_COARSE_LOCATION)) {
// If we can't even ask for enough permission to scan for Bluetooth devices, don't open

Powered by Google App Engine
This is Rietveld 408576698