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

Side by Side Diff: components/search_engines/template_url.cc

Issue 1134213002: [iOS] Upstream fork in template_url.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/search_engines/template_url.h" 5 #include "components/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 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 replacements->push_back(Replacement(GOOGLE_RLZ, start)); 665 replacements->push_back(Replacement(GOOGLE_RLZ, start));
666 } else if (parameter == kGoogleSearchClient) { 666 } else if (parameter == kGoogleSearchClient) {
667 replacements->push_back(Replacement(GOOGLE_SEARCH_CLIENT, start)); 667 replacements->push_back(Replacement(GOOGLE_SEARCH_CLIENT, start));
668 } else if (parameter == kGoogleSearchFieldtrialParameter) { 668 } else if (parameter == kGoogleSearchFieldtrialParameter) {
669 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start)); 669 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start));
670 } else if (parameter == kGoogleSearchVersion) { 670 } else if (parameter == kGoogleSearchVersion) {
671 replacements->push_back(Replacement(GOOGLE_SEARCH_VERSION, start)); 671 replacements->push_back(Replacement(GOOGLE_SEARCH_VERSION, start));
672 } else if (parameter == kGoogleSessionToken) { 672 } else if (parameter == kGoogleSessionToken) {
673 replacements->push_back(Replacement(GOOGLE_SESSION_TOKEN, start)); 673 replacements->push_back(Replacement(GOOGLE_SESSION_TOKEN, start));
674 } else if (parameter == kGoogleSourceIdParameter) { 674 } else if (parameter == kGoogleSourceIdParameter) {
675 #if defined(OS_ANDROID) 675 #if defined(OS_ANDROID) || defined(OS_IOS)
676 url->insert(start, "sourceid=chrome-mobile&"); 676 url->insert(start, "sourceid=chrome-mobile&");
677 #else 677 #else
678 url->insert(start, "sourceid=chrome&"); 678 url->insert(start, "sourceid=chrome&");
679 #endif 679 #endif
680 } else if (parameter == kGoogleSuggestAPIKeyParameter) { 680 } else if (parameter == kGoogleSuggestAPIKeyParameter) {
681 url->insert(start, 681 url->insert(start,
682 net::EscapeQueryParamValue(google_apis::GetAPIKey(), false)); 682 net::EscapeQueryParamValue(google_apis::GetAPIKey(), false));
683 } else if (parameter == kGoogleSuggestClient) { 683 } else if (parameter == kGoogleSuggestClient) {
684 replacements->push_back(Replacement(GOOGLE_SUGGEST_CLIENT, start)); 684 replacements->push_back(Replacement(GOOGLE_SUGGEST_CLIENT, start));
685 } else if (parameter == kGoogleSuggestRequestId) { 685 } else if (parameter == kGoogleSuggestRequestId) {
(...skipping 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
1543 // patterns. This means that given patterns 1543 // patterns. This means that given patterns
1544 // [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ], 1544 // [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
1545 // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would 1545 // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
1546 // return false. This is important for at least Google, where such URLs 1546 // return false. This is important for at least Google, where such URLs
1547 // are invalid. 1547 // are invalid.
1548 return !search_terms->empty(); 1548 return !search_terms->empty();
1549 } 1549 }
1550 } 1550 }
1551 return false; 1551 return false;
1552 } 1552 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698