Chromium Code Reviews| 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 41d2675e06cc3e8ca588339a7ae678b0de7f0a66..185526436f6b23f4224c0450cf5dddefbbd39a20 100644 |
| --- a/chrome/browser/search_engines/template_url.cc |
| +++ b/chrome/browser/search_engines/template_url.cc |
| @@ -42,6 +42,7 @@ const char kInputEncodingParameter[] = "inputEncoding"; |
| const char kOutputEncodingParameter[] = "outputEncoding"; |
| const char kGoogleAcceptedSuggestionParameter[] = "google:acceptedSuggestion"; |
| +const char kGoogleAssistedQueryStatsParameter[] = "google:assistedQueryStats"; |
| // Host/Domain Google searches are relative to. |
| const char kGoogleBaseURLParameter[] = "google:baseURL"; |
| const char kGoogleBaseURLParameterFull[] = "{google:baseURL}"; |
| @@ -126,7 +127,9 @@ std::string TemplateURLRef::GetURL() const { |
| case SEARCH: return owner_->url(); |
| case SUGGEST: return owner_->suggestions_url(); |
| case INSTANT: return owner_->instant_url(); |
| - default: NOTREACHED(); return std::string(); |
| + default: |
|
Peter Kasting
2012/06/14 01:04:23
Don't muck with this, please
Bart N
2012/06/15 18:07:34
I think I got some warning and fixed that. Anyway,
|
| + NOTREACHED(); |
| + return std::string(); |
| } |
| } |
| @@ -372,6 +375,15 @@ bool TemplateURLRef::HasGoogleBaseURLs() const { |
| return false; |
| } |
| +bool TemplateURLRef::SupportsAssistedQueryStats() const { |
| + ParseIfNecessary(); |
| + for (size_t i = 0; i < replacements_.size(); ++i) { |
| + if (replacements_[i].type == GOOGLE_ASSISTED_QUERY_STATS) |
| + return true; |
| + } |
| + return false; |
| +} |
| + |
| void TemplateURLRef::InvalidateCachedValues() const { |
| supports_replacements_ = valid_ = parsed_ = false; |
| host_.clear(); |
| @@ -417,6 +429,8 @@ bool TemplateURLRef::ParseParameter(size_t start, |
| url->insert(start, kOutputEncodingType); |
| } else if (parameter == kGoogleAcceptedSuggestionParameter) { |
| replacements->push_back(Replacement(GOOGLE_ACCEPTED_SUGGESTION, start)); |
| + } else if (parameter == kGoogleAssistedQueryStatsParameter) { |
| + replacements->push_back(Replacement(GOOGLE_ASSISTED_QUERY_STATS, start)); |
| } else if (parameter == kGoogleBaseURLParameter) { |
| replacements->push_back(Replacement(GOOGLE_BASE_URL, start)); |
| } else if (parameter == kGoogleBaseSuggestURLParameter) { |