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.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Use LOCATION_MODE instead of isProviderEnabled. 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

« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java » ('j') | components/location/OWNERS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..19ecd70370de8383f1f780d4ed68f2f8969dec4c 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java

@@ -18,6 +18,7 @@ import org.chromium.base.annotations.CalledByNative;

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;

@@ -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