chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java - Issue 2349473002: Implement native functions to query custom search engines for Android

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

Issue 2349473002: Implement native functions to query custom search engines for Android (Closed)

Patch Set: merge native functions to return generic template url and let Java side to decide which list it sho… Created 4 years, 3 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 | « no previous file | chrome/browser/search_engines/template_url_service_android.h » ('j') | chrome/browser/search_engines/template_url_service_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java

index 4f348d2b91ad1f423d164c412c0e90fd05be0343..2b7011181a6e8e92a77b200305d7c21bee4b1ea2 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java

@@ -47,16 +47,18 @@ public class TemplateUrlService {

public static class TemplateUrl {

private final int mIndex;

private final String mShortName;

+ private boolean mIsDefault;

Ian Wen 2016/09/16 20:43:04 s/mIsDefault/mIsPrepopulated

ltian 2016/09/16 21:39:10 Done.

@CalledByNative("TemplateUrl")

public static TemplateUrl create(

- int id, String shortName) {

- return new TemplateUrl(id, shortName);

+ int id, String shortName, boolean isDefault) {

+ return new TemplateUrl(id, shortName, isDefault);

}

- public TemplateUrl(int index, String shortName) {

+ public TemplateUrl(int index, String shortName, boolean isDefault) {

mIndex = index;

mShortName = shortName;

+ mIsDefault = isDefault;

}

public int getIndex() {

@@ -128,7 +130,7 @@ public class TemplateUrlService {

int templateUrlCount = nativeGetTemplateUrlCount(mNativeTemplateUrlServiceAndroid);

List<TemplateUrl> templateUrls = new ArrayList<TemplateUrl>(templateUrlCount);

for (int i = 0; i < templateUrlCount; i++) {

- TemplateUrl templateUrl = nativeGetPrepopulatedTemplateUrlAt(

+ TemplateUrl templateUrl = nativeGetTemplateUrlAt(

Ian Wen 2016/09/16 20:43:04 Have a boolean guard so that you don't create regr

ltian 2016/09/16 21:39:10 Done.

mNativeTemplateUrlServiceAndroid, i);

if (templateUrl != null) {

templateUrls.add(templateUrl);

@@ -176,7 +178,7 @@ public class TemplateUrlService {

assert defaultSearchEngineIndex < nativeGetTemplateUrlCount(

mNativeTemplateUrlServiceAndroid);

- return nativeGetPrepopulatedTemplateUrlAt(

+ return nativeGetTemplateUrlAt(

mNativeTemplateUrlServiceAndroid, defaultSearchEngineIndex);

}

@@ -306,7 +308,7 @@ public class TemplateUrlService {

private native void nativeLoad(long nativeTemplateUrlServiceAndroid);

private native boolean nativeIsLoaded(long nativeTemplateUrlServiceAndroid);

private native int nativeGetTemplateUrlCount(long nativeTemplateUrlServiceAndroid);

- private native TemplateUrl nativeGetPrepopulatedTemplateUrlAt(

+ private native TemplateUrl nativeGetTemplateUrlAt(

long nativeTemplateUrlServiceAndroid, int i);

Ian Wen 2016/09/16 20:43:04 Can you squash the two lines into one line?

ltian 2016/09/16 21:39:10 Done.

private native void nativeSetUserSelectedDefaultSearchProvider(

long nativeTemplateUrlServiceAndroid, int selectedIndex);