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

Side by Side Diff: chrome/browser/search_engines/template_url.cc

Issue 10905292: Add API key to omnibox's suggest requests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 42 -> 43 Created 8 years, 3 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/search_engines/template_url_prepopulate_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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.h" 5 #include "chrome/browser/search_engines/template_url.h"
6 6
7 #include "base/guid.h" 7 #include "base/guid.h"
8 #include "base/i18n/case_conversion.h" 8 #include "base/i18n/case_conversion.h"
9 #include "base/i18n/icu_string_conversions.h" 9 #include "base/i18n/icu_string_conversions.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/metrics/field_trial.h" 12 #include "base/metrics/field_trial.h"
13 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/stringprintf.h" 15 #include "base/stringprintf.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/browser/autocomplete/autocomplete_field_trial.h" 17 #include "chrome/browser/autocomplete/autocomplete_field_trial.h"
18 #include "chrome/browser/google/google_util.h" 18 #include "chrome/browser/google/google_util.h"
19 #include "chrome/browser/search_engines/search_terms_data.h" 19 #include "chrome/browser/search_engines/search_terms_data.h"
20 #include "chrome/browser/search_engines/template_url_service.h" 20 #include "chrome/browser/search_engines/template_url_service.h"
21 #include "chrome/common/url_constants.h" 21 #include "chrome/common/url_constants.h"
22 #include "google_apis/google_api_keys.h"
22 #include "net/base/escape.h" 23 #include "net/base/escape.h"
23 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
24 25
25 namespace { 26 namespace {
26 27
27 // The TemplateURLRef has any number of terms that need to be replaced. Each of 28 // The TemplateURLRef has any number of terms that need to be replaced. Each of
28 // the terms is enclosed in braces. If the character preceeding the final 29 // the terms is enclosed in braces. If the character preceeding the final
29 // brace is a ?, it indicates the term is optional and can be replaced with 30 // brace is a ?, it indicates the term is optional and can be replaced with
30 // an empty string. 31 // an empty string.
31 const char kStartParameter = '{'; 32 const char kStartParameter = '{';
(...skipping 18 matching lines...) Expand all
50 // Like google:baseURL, but for the Search Suggest capability. 51 // Like google:baseURL, but for the Search Suggest capability.
51 const char kGoogleBaseSuggestURLParameter[] = "google:baseSuggestURL"; 52 const char kGoogleBaseSuggestURLParameter[] = "google:baseSuggestURL";
52 const char kGoogleBaseSuggestURLParameterFull[] = "{google:baseSuggestURL}"; 53 const char kGoogleBaseSuggestURLParameterFull[] = "{google:baseSuggestURL}";
53 const char kGoogleInstantEnabledParameter[] = "google:instantEnabledParameter"; 54 const char kGoogleInstantEnabledParameter[] = "google:instantEnabledParameter";
54 const char kGoogleOriginalQueryForSuggestionParameter[] = 55 const char kGoogleOriginalQueryForSuggestionParameter[] =
55 "google:originalQueryForSuggestion"; 56 "google:originalQueryForSuggestion";
56 const char kGoogleRLZParameter[] = "google:RLZ"; 57 const char kGoogleRLZParameter[] = "google:RLZ";
57 // Same as kSearchTermsParameter, with no escaping. 58 // Same as kSearchTermsParameter, with no escaping.
58 const char kGoogleSearchFieldtrialParameter[] = 59 const char kGoogleSearchFieldtrialParameter[] =
59 "google:searchFieldtrialParameter"; 60 "google:searchFieldtrialParameter";
61 const char kGoogleSuggestAPIKeyParameter[] = "google:suggestAPIKeyParameter";
60 const char kGoogleUnescapedSearchTermsParameter[] = 62 const char kGoogleUnescapedSearchTermsParameter[] =
61 "google:unescapedSearchTerms"; 63 "google:unescapedSearchTerms";
62 const char kGoogleUnescapedSearchTermsParameterFull[] = 64 const char kGoogleUnescapedSearchTermsParameterFull[] =
63 "{google:unescapedSearchTerms}"; 65 "{google:unescapedSearchTerms}";
64 66
65 // Display value for kSearchTermsParameter. 67 // Display value for kSearchTermsParameter.
66 const char kDisplaySearchTerms[] = "%s"; 68 const char kDisplaySearchTerms[] = "%s";
67 69
68 // Display value for kGoogleUnescapedSearchTermsParameter. 70 // Display value for kGoogleUnescapedSearchTermsParameter.
69 const char kDisplayUnescapedSearchTerms[] = "%S"; 71 const char kDisplayUnescapedSearchTerms[] = "%S";
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 131 }
130 132
131 TemplateURLRef::~TemplateURLRef() { 133 TemplateURLRef::~TemplateURLRef() {
132 } 134 }
133 135
134 std::string TemplateURLRef::GetURL() const { 136 std::string TemplateURLRef::GetURL() const {
135 switch (type_) { 137 switch (type_) {
136 case SEARCH: return owner_->url(); 138 case SEARCH: return owner_->url();
137 case SUGGEST: return owner_->suggestions_url(); 139 case SUGGEST: return owner_->suggestions_url();
138 case INSTANT: return owner_->instant_url(); 140 case INSTANT: return owner_->instant_url();
139 default: NOTREACHED(); return std::string(); 141 default: NOTREACHED(); return std::string(); // NOLINT
140 } 142 }
141 } 143 }
142 144
143 bool TemplateURLRef::SupportsReplacement() const { 145 bool TemplateURLRef::SupportsReplacement() const {
144 UIThreadSearchTermsData search_terms_data(owner_->profile()); 146 UIThreadSearchTermsData search_terms_data(owner_->profile());
145 return SupportsReplacementUsingTermsData(search_terms_data); 147 return SupportsReplacementUsingTermsData(search_terms_data);
146 } 148 }
147 149
148 bool TemplateURLRef::SupportsReplacementUsingTermsData( 150 bool TemplateURLRef::SupportsReplacementUsingTermsData(
149 const SearchTermsData& search_terms_data) const { 151 const SearchTermsData& search_terms_data) const {
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start)); 457 replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start));
456 } else if (parameter == kGoogleInstantEnabledParameter) { 458 } else if (parameter == kGoogleInstantEnabledParameter) {
457 replacements->push_back(Replacement(GOOGLE_INSTANT_ENABLED, start)); 459 replacements->push_back(Replacement(GOOGLE_INSTANT_ENABLED, start));
458 } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) { 460 } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) {
459 replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION, 461 replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION,
460 start)); 462 start));
461 } else if (parameter == kGoogleRLZParameter) { 463 } else if (parameter == kGoogleRLZParameter) {
462 replacements->push_back(Replacement(GOOGLE_RLZ, start)); 464 replacements->push_back(Replacement(GOOGLE_RLZ, start));
463 } else if (parameter == kGoogleSearchFieldtrialParameter) { 465 } else if (parameter == kGoogleSearchFieldtrialParameter) {
464 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start)); 466 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start));
467 } else if (parameter == kGoogleSuggestAPIKeyParameter) {
468 url->insert(start,
469 net::EscapeQueryParamValue(google_apis::GetAPIKey(), false));
465 } else if (parameter == kGoogleUnescapedSearchTermsParameter) { 470 } else if (parameter == kGoogleUnescapedSearchTermsParameter) {
466 replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start)); 471 replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start));
467 } else if (!prepopulated_) { 472 } else if (!prepopulated_) {
468 // If it's a prepopulated URL, we know that it's safe to remove unknown 473 // If it's a prepopulated URL, we know that it's safe to remove unknown
469 // parameters, so just ignore this and return true below. Otherwise it could 474 // parameters, so just ignore this and return true below. Otherwise it could
470 // be some garbage but can also be a javascript block. Put it back. 475 // be some garbage but can also be a javascript block. Put it back.
471 url->insert(start, full_parameter); 476 url->insert(start, full_parameter);
472 return false; 477 return false;
473 } 478 }
474 return true; 479 return true;
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
711 } 716 }
712 717
713 void TemplateURL::ResetKeywordIfNecessary(bool force) { 718 void TemplateURL::ResetKeywordIfNecessary(bool force) {
714 if (IsGoogleSearchURLWithReplaceableKeyword() || force) { 719 if (IsGoogleSearchURLWithReplaceableKeyword() || force) {
715 DCHECK(!IsExtensionKeyword()); 720 DCHECK(!IsExtensionKeyword());
716 GURL url(TemplateURLService::GenerateSearchURL(this)); 721 GURL url(TemplateURLService::GenerateSearchURL(this));
717 if (url.is_valid()) 722 if (url.is_valid())
718 data_.SetKeyword(TemplateURLService::GenerateKeyword(url)); 723 data_.SetKeyword(TemplateURLService::GenerateKeyword(url));
719 } 724 }
720 } 725 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/search_engines/template_url_prepopulate_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698