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

Unified Diff: chrome/browser/search_engines/template_url.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.cc
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 07a1f797cafc3035763b16a5b1fe16e9ff6d7775..96bd530f40621ef3deb3c2ff14b91cf02b31f591 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -68,6 +68,7 @@ const char kGoogleBookmarkBarPinnedParameter[] = "google:bookmarkBarPinned";
const char kGoogleCurrentPageUrlParameter[] = "google:currentPageUrl";
const char kGoogleCursorPositionParameter[] = "google:cursorPosition";
const char kGoogleForceInstantResultsParameter[] = "google:forceInstantResults";
+const char kGoogleVoiceInputSource[] = "google:voiceInputSource";
const char kGoogleInstantExtendedEnabledParameter[] =
"google:instantExtendedEnabledParameter";
const char kGoogleInstantExtendedEnabledKey[] =
@@ -206,7 +207,8 @@ TemplateURLRef::SearchTermsArgs::SearchTermsArgs(
page_classification(AutocompleteInput::INVALID_SPEC),
bookmark_bar_pinned(false),
append_extra_query_params(false),
- force_instant_results(false) {
+ force_instant_results(false),
+ is_voice_input_source(false) {
}
TemplateURLRef::SearchTermsArgs::~SearchTermsArgs() {
@@ -585,6 +587,9 @@ bool TemplateURLRef::ParseParameter(size_t start,
start));
} else if (parameter == kGoogleInstantExtendedEnabledKey) {
url->insert(start, google_util::kInstantExtendedAPIParam);
+ } else if (parameter == kGoogleVoiceInputSource) {
+ replacements->push_back(Replacement(GOOGLE_VOICE_INPUT_SOURCE,
+ start));
} else if (parameter == kGoogleNTPIsThemedParameter) {
replacements->push_back(Replacement(GOOGLE_NTP_IS_THEMED, start));
} else if (parameter == kGoogleOmniboxStartMarginParameter) {
@@ -892,6 +897,15 @@ std::string TemplateURLRef::HandleReplacements(
&url);
break;
+ case GOOGLE_VOICE_INPUT_SOURCE:
+ DCHECK(!i->is_post_param);
+ HandleReplacement(std::string(),
+ search_terms_data.VoiceInputSourceParam(
+ search_terms_args.is_voice_input_source),
+ *i,
+ &url);
+ break;
+
case GOOGLE_INSTANT_EXTENDED_ENABLED:
DCHECK(!i->is_post_param);
HandleReplacement(

Powered by Google App Engine
This is Rietveld 408576698