From 5eebb43b5eb87e9a2d853b8d66c65546e1a27e12 Mon Sep 17 00:00:00 2001 From: "csorba@chromium.org" Date: Wed, 3 Jul 2013 11:29:29 +0000 Subject: Adding the forced searchengine to the list of localizedSearchEngines. BUG=256979 Review URL: https://chromiumcodereview.appspot.com/18351003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209954 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/search_engines/OWNERS | 4 +++- chrome/browser/search_engines/template_url_service_android.cc | 8 +++++++- chrome/browser/search_engines/template_url_service_android.h | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'chrome/browser/search_engines') diff --git a/chrome/browser/search_engines/OWNERS b/chrome/browser/search_engines/OWNERS index ac2ccb7..00102bf 100644 --- a/chrome/browser/search_engines/OWNERS +++ b/chrome/browser/search_engines/OWNERS @@ -1,3 +1,5 @@ pkasting@chromium.org sky@chromium.org -stevet@chromium.org \ No newline at end of file +stevet@chromium.org + +per-file *_android.*=yfriedman@chromium.org \ No newline at end of file diff --git a/chrome/browser/search_engines/template_url_service_android.cc b/chrome/browser/search_engines/template_url_service_android.cc index 6229549..1081a03 100644 --- a/chrome/browser/search_engines/template_url_service_android.cc +++ b/chrome/browser/search_engines/template_url_service_android.cc @@ -95,12 +95,18 @@ jint TemplateUrlServiceAndroid::GetTemplateUrlCount(JNIEnv* env, jobject obj) { return template_url_service_->GetTemplateURLs().size(); } +jboolean TemplateUrlServiceAndroid::IsSearchProviderManaged(JNIEnv* env, + jobject obj) { + return template_url_service_->is_default_search_managed(); +} + base::android::ScopedJavaLocalRef TemplateUrlServiceAndroid::GetPrepopulatedTemplateUrlAt(JNIEnv* env, jobject obj, jint index) { TemplateURL* template_url = template_url_service_->GetTemplateURLs()[index]; - if (!IsPrepopulatedTemplate(template_url)) + if (!IsPrepopulatedTemplate(template_url) && + !template_url->created_by_policy()) return ScopedJavaLocalRef(); return Java_TemplateUrl_create( diff --git a/chrome/browser/search_engines/template_url_service_android.h b/chrome/browser/search_engines/template_url_service_android.h index b02cf76..97336e8 100644 --- a/chrome/browser/search_engines/template_url_service_android.h +++ b/chrome/browser/search_engines/template_url_service_android.h @@ -28,6 +28,7 @@ class TemplateUrlServiceAndroid : public content::NotificationObserver { jboolean IsLoaded(JNIEnv* env, jobject obj); base::android::ScopedJavaLocalRef GetPrepopulatedTemplateUrlAt(JNIEnv* env, jobject obj, jint index); + jboolean IsSearchProviderManaged(JNIEnv* env, jobject obj); // NotificationObserver: virtual void Observe(int type, -- cgit v1.1