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

Unified Diff: chrome/browser/search_engines/template_url_service_android.cc

Issue 106103006: Added android Template URL support for voice search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed IsVoiceSearchURL Created 7 years 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/browser/search_engines/template_url_service_android.cc
diff --git a/chrome/browser/search_engines/template_url_service_android.cc b/chrome/browser/search_engines/template_url_service_android.cc
index abae558366eb76602fbd475d285ee8acdc28d048..f82d37931387f07db050b85dc3bd59cfcb6b9a3f 100644
--- a/chrome/browser/search_engines/template_url_service_android.cc
+++ b/chrome/browser/search_engines/template_url_service_android.cc
@@ -156,6 +156,26 @@ TemplateUrlServiceAndroid::GetUrlForSearchQuery(JNIEnv* env,
}
base::android::ScopedJavaLocalRef<jstring>
+TemplateUrlServiceAndroid::GetUrlForVoiceSearchQuery(JNIEnv* env,
+ jobject obj,
+ jstring jquery) {
+ const TemplateURL* default_provider =
+ template_url_service_->GetDefaultSearchProvider();
+
+ base::string16 query(ConvertJavaStringToUTF16(env, jquery));
+
+ std::string url;
+ if (default_provider &&
+ default_provider->url_ref().SupportsReplacement() && !query.empty()) {
+ TemplateURLRef::SearchTermsArgs args(query);
+ args.is_voice_input_source = true;
+ url = default_provider->url_ref().ReplaceSearchTerms(args);
+ }
+
+ return ConvertUTF8ToJavaString(env, url);
+}
+
+base::android::ScopedJavaLocalRef<jstring>
TemplateUrlServiceAndroid::ReplaceSearchTermsInUrl(JNIEnv* env,
jobject obj,
jstring jquery,

Powered by Google App Engine
This is Rietveld 408576698