| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
|
| index f3ffe3514c3e67cec728080ec089331a61d2c88f..fa04ca69eb753316428fe930d26782ebbb619c03 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java
|
| @@ -25,6 +25,7 @@ import android.widget.TextView;
|
|
|
| import org.chromium.base.ApiCompatibilityUtils;
|
| import org.chromium.base.ContextUtils;
|
| +import org.chromium.base.LocationUtils;
|
| import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
|
| import org.chromium.chrome.browser.preferences.website.ContentSetting;
|
| @@ -204,7 +205,7 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On
|
| if (selected) {
|
| ForegroundColorSpan linkSpan = new ForegroundColorSpan(
|
| ApiCompatibilityUtils.getColor(resources, R.color.pref_accent_color));
|
| - if (LocationSettings.getInstance().isSystemLocationSettingEnabled()) {
|
| + if (LocationUtils.getInstance().isSystemLocationSettingEnabled(mContext)) {
|
| String message = mContext.getString(
|
| locationEnabled(position, true)
|
| ? R.string.search_engine_location_allowed
|
| @@ -270,9 +271,9 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On
|
| }
|
|
|
| private void onLocationLinkClicked() {
|
| - if (!LocationSettings.getInstance().isSystemLocationSettingEnabled()) {
|
| + if (!LocationUtils.getInstance().isSystemLocationSettingEnabled(mContext)) {
|
| mContext.startActivity(
|
| - LocationSettings.getInstance().getSystemLocationSettingsIntent());
|
| + LocationUtils.getInstance().getSystemLocationSettingsIntent());
|
| } else {
|
| Intent settingsIntent = PreferencesLauncher.createIntentForSettingsPage(
|
| mContext, SingleWebsitePreferences.class.getName());
|
|
|