| Index: chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
|
| index 671df70dc8669b15136666586d28a5528e63b948..3b355a8cac84b14f810ef09d3ae88bcad22790dd 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java
|
| @@ -59,6 +59,7 @@ import org.chromium.chrome.browser.profiles.Profile;
|
| import org.chromium.chrome.browser.ssl.SecurityStateModel;
|
| import org.chromium.chrome.browser.tab.Tab;
|
| import org.chromium.chrome.browser.util.UrlUtilities;
|
| +import org.chromium.components.location.LocationUtils;
|
| import org.chromium.components.security_state.ConnectionSecurityLevel;
|
| import org.chromium.content.browser.ContentViewCore;
|
| import org.chromium.content_public.browser.WebContents;
|
| @@ -565,15 +566,6 @@ public class WebsiteSettingsPopup implements OnClickListener {
|
| == PackageManager.PERMISSION_GRANTED);
|
| }
|
|
|
| - private boolean isAndroidLocationDisabled() {
|
| - try {
|
| - return Settings.Secure.getInt(mContext.getContentResolver(),
|
| - Settings.Secure.LOCATION_MODE) == Settings.Secure.LOCATION_MODE_OFF;
|
| - } catch (Settings.SettingNotFoundException e) {
|
| - return false;
|
| - }
|
| - }
|
| -
|
| /**
|
| * Adds a new row for the given permission.
|
| *
|
| @@ -613,11 +605,12 @@ public class WebsiteSettingsPopup implements OnClickListener {
|
|
|
| // If warningTextResource is non-zero, then the view must be tagged with either
|
| // permission_intent_override or permission_type.
|
| + LocationUtils locationUtils = LocationUtils.getInstance();
|
| if (permission.type == ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION
|
| - && isAndroidLocationDisabled()) {
|
| + && !locationUtils.isSystemLocationSettingEnabled(mContext)) {
|
| warningTextResource = R.string.page_info_android_location_blocked;
|
| permissionRow.setTag(R.id.permission_intent_override,
|
| - new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS));
|
| + locationUtils.getSystemLocationSettingsIntent());
|
| } else if (!hasAndroidPermission(permission.type)) {
|
| warningTextResource = R.string.page_info_android_permission_blocked;
|
| permissionRow.setTag(R.id.permission_type,
|
|
|