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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/search_engines/template_url_service_android.h" 5 #include "chrome/browser/search_engines/template_url_service_android.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 if (default_provider && 149 if (default_provider &&
150 default_provider->url_ref().SupportsReplacement() && !query.empty()) { 150 default_provider->url_ref().SupportsReplacement() && !query.empty()) {
151 url = default_provider->url_ref().ReplaceSearchTerms( 151 url = default_provider->url_ref().ReplaceSearchTerms(
152 TemplateURLRef::SearchTermsArgs(query)); 152 TemplateURLRef::SearchTermsArgs(query));
153 } 153 }
154 154
155 return ConvertUTF8ToJavaString(env, url); 155 return ConvertUTF8ToJavaString(env, url);
156 } 156 }
157 157
158 base::android::ScopedJavaLocalRef<jstring> 158 base::android::ScopedJavaLocalRef<jstring>
159 TemplateUrlServiceAndroid::GetUrlForVoiceSearchQuery(JNIEnv* env,
160 jobject obj,
161 jstring jquery) {
162 const TemplateURL* default_provider =
163 template_url_service_->GetDefaultSearchProvider();
164
165 base::string16 query(ConvertJavaStringToUTF16(env, jquery));
166
167 std::string url;
168 if (default_provider &&
169 default_provider->url_ref().SupportsReplacement() && !query.empty()) {
170 TemplateURLRef::SearchTermsArgs args(query);
171 args.is_voice_input_source = true;
172 url = default_provider->url_ref().ReplaceSearchTerms(args);
173 }
174
175 return ConvertUTF8ToJavaString(env, url);
176 }
177
178 base::android::ScopedJavaLocalRef<jstring>
159 TemplateUrlServiceAndroid::ReplaceSearchTermsInUrl(JNIEnv* env, 179 TemplateUrlServiceAndroid::ReplaceSearchTermsInUrl(JNIEnv* env,
160 jobject obj, 180 jobject obj,
161 jstring jquery, 181 jstring jquery,
162 jstring jcurrent_url) { 182 jstring jcurrent_url) {
163 TemplateURL* default_provider = 183 TemplateURL* default_provider =
164 template_url_service_->GetDefaultSearchProvider(); 184 template_url_service_->GetDefaultSearchProvider();
165 185
166 base::string16 query(ConvertJavaStringToUTF16(env, jquery)); 186 base::string16 query(ConvertJavaStringToUTF16(env, jquery));
167 GURL current_url(ConvertJavaStringToUTF16(env, jcurrent_url)); 187 GURL current_url(ConvertJavaStringToUTF16(env, jcurrent_url));
168 GURL destination_url(current_url); 188 GURL destination_url(current_url);
169 if (default_provider && !query.empty()) { 189 if (default_provider && !query.empty()) {
170 bool refined_query = default_provider->ReplaceSearchTermsInURL(current_url, 190 bool refined_query = default_provider->ReplaceSearchTermsInURL(current_url,
171 TemplateURLRef::SearchTermsArgs(query), &destination_url); 191 TemplateURLRef::SearchTermsArgs(query), &destination_url);
172 if (refined_query) 192 if (refined_query)
173 return ConvertUTF8ToJavaString(env, destination_url.spec()); 193 return ConvertUTF8ToJavaString(env, destination_url.spec());
174 } 194 }
175 return base::android::ScopedJavaLocalRef<jstring>(env, NULL); 195 return base::android::ScopedJavaLocalRef<jstring>(env, NULL);
176 } 196 }
177 197
178 static jlong Init(JNIEnv* env, jobject obj) { 198 static jlong Init(JNIEnv* env, jobject obj) {
179 TemplateUrlServiceAndroid* template_url_service_android = 199 TemplateUrlServiceAndroid* template_url_service_android =
180 new TemplateUrlServiceAndroid(env, obj); 200 new TemplateUrlServiceAndroid(env, obj);
181 return reinterpret_cast<intptr_t>(template_url_service_android); 201 return reinterpret_cast<intptr_t>(template_url_service_android);
182 } 202 }
183 203
184 // static 204 // static
185 bool TemplateUrlServiceAndroid::Register(JNIEnv* env) { 205 bool TemplateUrlServiceAndroid::Register(JNIEnv* env) {
186 return RegisterNativesImpl(env); 206 return RegisterNativesImpl(env);
187 } 207 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698