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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.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: Adjust DEPS. 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/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..46431f901298e447d9de6c42a3b2ddd8cba82b13 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
@@ -34,6 +34,7 @@ import org.chromium.chrome.browser.preferences.website.WebsitePreferenceBridge;
import org.chromium.chrome.browser.search_engines.TemplateUrlService;
import org.chromium.chrome.browser.search_engines.TemplateUrlService.LoadListener;
import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrl;
+import org.chromium.components.location.LocationUtils;
import org.chromium.ui.text.SpanApplier;
import org.chromium.ui.text.SpanApplier.SpanInfo;
@@ -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,8 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On
}
private void onLocationLinkClicked() {
- if (!LocationSettings.getInstance().isSystemLocationSettingEnabled()) {
- mContext.startActivity(
- LocationSettings.getInstance().getSystemLocationSettingsIntent());
+ if (!LocationUtils.getInstance().isSystemLocationSettingEnabled(mContext)) {
+ mContext.startActivity(LocationUtils.getInstance().getSystemLocationSettingsIntent());
} else {
Intent settingsIntent = PreferencesLauncher.createIntentForSettingsPage(
mContext, SingleWebsitePreferences.class.getName());

Powered by Google App Engine
This is Rietveld 408576698