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

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

Issue 276073002: [AiS] Provide Answers queries with a session token. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 const char kGoogleNTPIsThemedParameter[] = "google:ntpIsThemedParameter"; 77 const char kGoogleNTPIsThemedParameter[] = "google:ntpIsThemedParameter";
78 const char kGoogleOmniboxStartMarginParameter[] = 78 const char kGoogleOmniboxStartMarginParameter[] =
79 "google:omniboxStartMarginParameter"; 79 "google:omniboxStartMarginParameter";
80 const char kGoogleOriginalQueryForSuggestionParameter[] = 80 const char kGoogleOriginalQueryForSuggestionParameter[] =
81 "google:originalQueryForSuggestion"; 81 "google:originalQueryForSuggestion";
82 const char kGooglePageClassificationParameter[] = "google:pageClassification"; 82 const char kGooglePageClassificationParameter[] = "google:pageClassification";
83 const char kGoogleRLZParameter[] = "google:RLZ"; 83 const char kGoogleRLZParameter[] = "google:RLZ";
84 const char kGoogleSearchClient[] = "google:searchClient"; 84 const char kGoogleSearchClient[] = "google:searchClient";
85 const char kGoogleSearchFieldtrialParameter[] = 85 const char kGoogleSearchFieldtrialParameter[] =
86 "google:searchFieldtrialParameter"; 86 "google:searchFieldtrialParameter";
87 const char kGoogleSessionToken[] = "google:sessionToken";
87 const char kGoogleSourceIdParameter[] = "google:sourceId"; 88 const char kGoogleSourceIdParameter[] = "google:sourceId";
88 const char kGoogleSuggestAPIKeyParameter[] = "google:suggestAPIKeyParameter"; 89 const char kGoogleSuggestAPIKeyParameter[] = "google:suggestAPIKeyParameter";
89 const char kGoogleSuggestClient[] = "google:suggestClient"; 90 const char kGoogleSuggestClient[] = "google:suggestClient";
90 const char kGoogleSuggestRequestId[] = "google:suggestRid"; 91 const char kGoogleSuggestRequestId[] = "google:suggestRid";
91 92
92 // Same as kSearchTermsParameter, with no escaping. 93 // Same as kSearchTermsParameter, with no escaping.
93 const char kGoogleUnescapedSearchTermsParameter[] = 94 const char kGoogleUnescapedSearchTermsParameter[] =
94 "google:unescapedSearchTerms"; 95 "google:unescapedSearchTerms";
95 const char kGoogleUnescapedSearchTermsParameterFull[] = 96 const char kGoogleUnescapedSearchTermsParameterFull[] =
96 "{google:unescapedSearchTerms}"; 97 "{google:unescapedSearchTerms}";
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION, 595 replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION,
595 start)); 596 start));
596 } else if (parameter == kGooglePageClassificationParameter) { 597 } else if (parameter == kGooglePageClassificationParameter) {
597 replacements->push_back(Replacement(GOOGLE_PAGE_CLASSIFICATION, start)); 598 replacements->push_back(Replacement(GOOGLE_PAGE_CLASSIFICATION, start));
598 } else if (parameter == kGoogleRLZParameter) { 599 } else if (parameter == kGoogleRLZParameter) {
599 replacements->push_back(Replacement(GOOGLE_RLZ, start)); 600 replacements->push_back(Replacement(GOOGLE_RLZ, start));
600 } else if (parameter == kGoogleSearchClient) { 601 } else if (parameter == kGoogleSearchClient) {
601 replacements->push_back(Replacement(GOOGLE_SEARCH_CLIENT, start)); 602 replacements->push_back(Replacement(GOOGLE_SEARCH_CLIENT, start));
602 } else if (parameter == kGoogleSearchFieldtrialParameter) { 603 } else if (parameter == kGoogleSearchFieldtrialParameter) {
603 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start)); 604 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start));
605 } else if (parameter == kGoogleSessionToken) {
606 replacements->push_back(Replacement(GOOGLE_SESSION_TOKEN, start));
604 } else if (parameter == kGoogleSourceIdParameter) { 607 } else if (parameter == kGoogleSourceIdParameter) {
605 #if defined(OS_ANDROID) 608 #if defined(OS_ANDROID)
606 url->insert(start, "sourceid=chrome-mobile&"); 609 url->insert(start, "sourceid=chrome-mobile&");
607 #else 610 #else
608 url->insert(start, "sourceid=chrome&"); 611 url->insert(start, "sourceid=chrome&");
609 #endif 612 #endif
610 } else if (parameter == kGoogleSuggestAPIKeyParameter) { 613 } else if (parameter == kGoogleSuggestAPIKeyParameter) {
611 url->insert(start, 614 url->insert(start,
612 net::EscapeQueryParamValue(google_apis::GetAPIKey(), false)); 615 net::EscapeQueryParamValue(google_apis::GetAPIKey(), false));
613 } else if (parameter == kGoogleSuggestClient) { 616 } else if (parameter == kGoogleSuggestClient) {
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 HandleReplacement("client", client, *i, &url); 962 HandleReplacement("client", client, *i, &url);
960 break; 963 break;
961 } 964 }
962 965
963 case GOOGLE_SEARCH_FIELDTRIAL_GROUP: 966 case GOOGLE_SEARCH_FIELDTRIAL_GROUP:
964 // We are not currently running any fieldtrials that modulate the search 967 // We are not currently running any fieldtrials that modulate the search
965 // url. If we do, then we'd have some conditional insert such as: 968 // url. If we do, then we'd have some conditional insert such as:
966 // url.insert(i->index, used_www ? "gcx=w&" : "gcx=c&"); 969 // url.insert(i->index, used_www ? "gcx=w&" : "gcx=c&");
967 break; 970 break;
968 971
972 case GOOGLE_SESSION_TOKEN: {
973 std::string token = search_terms_args.session_token;
Peter Kasting 2014/05/09 21:35:07 Nit: Either inline this directly into the uses bel
974 if (!token.empty())
975 HandleReplacement("psi", token, *i, &url);
976 break;
977 }
978
969 case GOOGLE_SUGGEST_CLIENT: 979 case GOOGLE_SUGGEST_CLIENT:
970 HandleReplacement( 980 HandleReplacement(
971 std::string(), search_terms_data.GetSuggestClient(), *i, &url); 981 std::string(), search_terms_data.GetSuggestClient(), *i, &url);
972 break; 982 break;
973 983
974 case GOOGLE_SUGGEST_REQUEST_ID: 984 case GOOGLE_SUGGEST_REQUEST_ID:
975 HandleReplacement( 985 HandleReplacement(
976 std::string(), search_terms_data.GetSuggestRequestIdentifier(), *i, 986 std::string(), search_terms_data.GetSuggestRequestIdentifier(), *i,
977 &url); 987 &url);
978 break; 988 break;
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 // patterns. This means that given patterns 1340 // patterns. This means that given patterns
1331 // [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ], 1341 // [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
1332 // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would 1342 // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
1333 // return false. This is important for at least Google, where such URLs 1343 // return false. This is important for at least Google, where such URLs
1334 // are invalid. 1344 // are invalid.
1335 return !search_terms->empty(); 1345 return !search_terms->empty();
1336 } 1346 }
1337 } 1347 }
1338 return false; 1348 return false;
1339 } 1349 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698