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

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

Issue 1146673002: [Cleanup] Inline strings constants used only once (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@yandex
Patch Set: Address pkasting comments 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 27 matching lines...) Expand all
38 // brace is a ?, it indicates the term is optional and can be replaced with 38 // brace is a ?, it indicates the term is optional and can be replaced with
39 // an empty string. 39 // an empty string.
40 const char kStartParameter = '{'; 40 const char kStartParameter = '{';
41 const char kEndParameter = '}'; 41 const char kEndParameter = '}';
42 const char kOptional = '?'; 42 const char kOptional = '?';
43 43
44 // Known parameters found in the URL. 44 // Known parameters found in the URL.
45 const char kSearchTermsParameter[] = "searchTerms"; 45 const char kSearchTermsParameter[] = "searchTerms";
46 const char kSearchTermsParameterFull[] = "{searchTerms}"; 46 const char kSearchTermsParameterFull[] = "{searchTerms}";
47 const char kSearchTermsParameterFullEscaped[] = "%7BsearchTerms%7D"; 47 const char kSearchTermsParameterFullEscaped[] = "%7BsearchTerms%7D";
48 const char kCountParameter[] = "count";
49 const char kStartIndexParameter[] = "startIndex";
50 const char kStartPageParameter[] = "startPage";
51 const char kLanguageParameter[] = "language";
52 const char kInputEncodingParameter[] = "inputEncoding";
53 const char kOutputEncodingParameter[] = "outputEncoding";
54
55 const char kGoogleAssistedQueryStatsParameter[] = "google:assistedQueryStats";
56
57 // Host/Domain Google searches are relative to.
58 const char kGoogleBaseURLParameter[] = "google:baseURL";
59 const char kGoogleBaseURLParameterFull[] = "{google:baseURL}";
60
61 // Like google:baseURL, but for the Search Suggest capability.
62 const char kGoogleBaseSuggestURLParameter[] = "google:baseSuggestURL";
63 const char kGoogleBaseSuggestURLParameterFull[] = "{google:baseSuggestURL}";
64 const char kGoogleBookmarkBarPinnedParameter[] = "google:bookmarkBarPinned";
65 const char kGoogleContextualSearchContextData[] =
66 "google:contextualSearchContextData";
67 const char kGoogleContextualSearchVersion[] = "google:contextualSearchVersion";
68 const char kGoogleCurrentPageUrlParameter[] = "google:currentPageUrl";
69 const char kGoogleCursorPositionParameter[] = "google:cursorPosition";
70 const char kGoogleForceInstantResultsParameter[] = "google:forceInstantResults";
71 const char kGoogleImageSearchSource[] = "google:imageSearchSource";
72 const char kGoogleImageThumbnailParameter[] = "google:imageThumbnail";
73 const char kGoogleImageOriginalWidth[] = "google:imageOriginalWidth";
74 const char kGoogleImageOriginalHeight[] = "google:imageOriginalHeight";
75 const char kGoogleImageURLParameter[] = "google:imageURL";
76 const char kGoogleInputTypeParameter[] = "google:inputType";
77 const char kGoogleInstantExtendedEnabledParameter[] =
78 "google:instantExtendedEnabledParameter";
79 const char kGoogleInstantExtendedEnabledKey[] =
80 "google:instantExtendedEnabledKey";
81 const char kGoogleInstantExtendedEnabledKeyFull[] =
82 "{google:instantExtendedEnabledKey}";
83 const char kGoogleNTPIsThemedParameter[] = "google:ntpIsThemedParameter";
84 const char kGoogleOmniboxStartMarginParameter[] =
85 "google:omniboxStartMarginParameter";
86 const char kGoogleOriginalQueryForSuggestionParameter[] =
87 "google:originalQueryForSuggestion";
88 const char kGooglePageClassificationParameter[] = "google:pageClassification";
89 const char kGooglePrefetchQuery[] = "google:prefetchQuery";
90 const char kGoogleRLZParameter[] = "google:RLZ";
91 const char kGoogleSearchClient[] = "google:searchClient";
92 const char kGoogleSearchFieldtrialParameter[] =
93 "google:searchFieldtrialParameter";
94 const char kGoogleSearchVersion[] = "google:searchVersion";
95 const char kGoogleSessionToken[] = "google:sessionToken";
96 const char kGoogleSourceIdParameter[] = "google:sourceId";
97 const char kGoogleSuggestAPIKeyParameter[] = "google:suggestAPIKeyParameter";
98 const char kGoogleSuggestClient[] = "google:suggestClient";
99 const char kGoogleSuggestRequestId[] = "google:suggestRid";
100 48
101 // Same as kSearchTermsParameter, with no escaping. 49 // Same as kSearchTermsParameter, with no escaping.
102 const char kGoogleUnescapedSearchTermsParameter[] = 50 const char kGoogleUnescapedSearchTermsParameter[] =
103 "google:unescapedSearchTerms"; 51 "google:unescapedSearchTerms";
104 const char kGoogleUnescapedSearchTermsParameterFull[] = 52 const char kGoogleUnescapedSearchTermsParameterFull[] =
105 "{google:unescapedSearchTerms}"; 53 "{google:unescapedSearchTerms}";
106 54
107 // Display value for kSearchTermsParameter. 55 // Display value for kSearchTermsParameter.
108 const char kDisplaySearchTerms[] = "%s"; 56 const char kDisplaySearchTerms[] = "%s";
109 57
110 // Display value for kGoogleUnescapedSearchTermsParameter. 58 // Display value for kGoogleUnescapedSearchTermsParameter.
111 const char kDisplayUnescapedSearchTerms[] = "%S"; 59 const char kDisplayUnescapedSearchTerms[] = "%S";
112 60
113 // Used if the count parameter is not optional. Indicates we want 10 search 61 // Used if the count parameter is not optional. Indicates we want 10 search
114 // results. 62 // results.
115 const char kDefaultCount[] = "10"; 63 const char kDefaultCount[] = "10";
116 64
117 // Used if the parameter kOutputEncodingParameter is required. 65 // Used if the output encoding parameter is required.
118 const char kOutputEncodingType[] = "UTF-8"; 66 const char kOutputEncodingType[] = "UTF-8";
119 67
120 // Attempts to encode |terms| and |original_query| in |encoding| and escape 68 // Attempts to encode |terms| and |original_query| in |encoding| and escape
121 // them. |terms| may be escaped as path or query depending on |is_in_query|; 69 // them. |terms| may be escaped as path or query depending on |is_in_query|;
122 // |original_query| is always escaped as query. Returns whether the encoding 70 // |original_query| is always escaped as query. Returns whether the encoding
123 // process succeeded. 71 // process succeeded.
124 bool TryEncoding(const base::string16& terms, 72 bool TryEncoding(const base::string16& terms,
125 const base::string16& original_query, 73 const base::string16& original_query,
126 const char* encoding, 74 const char* encoding,
127 bool is_in_query, 75 bool is_in_query,
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 length--; 546 length--;
599 } 547 }
600 std::string parameter(url->substr(start + 1, length)); 548 std::string parameter(url->substr(start + 1, length));
601 std::string full_parameter(url->substr(start, end - start + 1)); 549 std::string full_parameter(url->substr(start, end - start + 1));
602 // Remove the parameter from the string. For parameters who replacement is 550 // Remove the parameter from the string. For parameters who replacement is
603 // constant and already known, just replace them directly. For other cases, 551 // constant and already known, just replace them directly. For other cases,
604 // like parameters whose values may change over time, use |replacements|. 552 // like parameters whose values may change over time, use |replacements|.
605 url->erase(start, end - start + 1); 553 url->erase(start, end - start + 1);
606 if (parameter == kSearchTermsParameter) { 554 if (parameter == kSearchTermsParameter) {
607 replacements->push_back(Replacement(SEARCH_TERMS, start)); 555 replacements->push_back(Replacement(SEARCH_TERMS, start));
608 } else if (parameter == kCountParameter) { 556 } else if (parameter == "count") {
609 if (!optional) 557 if (!optional)
610 url->insert(start, kDefaultCount); 558 url->insert(start, kDefaultCount);
611 } else if (parameter == kGoogleAssistedQueryStatsParameter) { 559 } else if (parameter == "google:assistedQueryStats") {
612 replacements->push_back(Replacement(GOOGLE_ASSISTED_QUERY_STATS, start)); 560 replacements->push_back(Replacement(GOOGLE_ASSISTED_QUERY_STATS, start));
613 } else if (parameter == kGoogleBaseURLParameter) { 561 } else if (parameter == "google:baseURL") {
614 replacements->push_back(Replacement(GOOGLE_BASE_URL, start)); 562 replacements->push_back(Replacement(GOOGLE_BASE_URL, start));
615 } else if (parameter == kGoogleBaseSuggestURLParameter) { 563 } else if (parameter == "google:baseSuggestURL") {
616 replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start)); 564 replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start));
617 } else if (parameter == kGoogleBookmarkBarPinnedParameter) { 565 } else if (parameter == "google:bookmarkBarPinned") {
618 replacements->push_back(Replacement(GOOGLE_BOOKMARK_BAR_PINNED, start)); 566 replacements->push_back(Replacement(GOOGLE_BOOKMARK_BAR_PINNED, start));
619 } else if (parameter == kGoogleCurrentPageUrlParameter) { 567 } else if (parameter == "google:currentPageUrl") {
620 replacements->push_back(Replacement(GOOGLE_CURRENT_PAGE_URL, start)); 568 replacements->push_back(Replacement(GOOGLE_CURRENT_PAGE_URL, start));
621 } else if (parameter == kGoogleCursorPositionParameter) { 569 } else if (parameter == "google:cursorPosition") {
622 replacements->push_back(Replacement(GOOGLE_CURSOR_POSITION, start)); 570 replacements->push_back(Replacement(GOOGLE_CURSOR_POSITION, start));
623 } else if (parameter == kGoogleForceInstantResultsParameter) { 571 } else if (parameter == "google:forceInstantResults") {
624 replacements->push_back(Replacement(GOOGLE_FORCE_INSTANT_RESULTS, start)); 572 replacements->push_back(Replacement(GOOGLE_FORCE_INSTANT_RESULTS, start));
625 } else if (parameter == kGoogleImageOriginalHeight) { 573 } else if (parameter == "google:imageOriginalHeight") {
626 replacements->push_back( 574 replacements->push_back(
627 Replacement(TemplateURLRef::GOOGLE_IMAGE_ORIGINAL_HEIGHT, start)); 575 Replacement(TemplateURLRef::GOOGLE_IMAGE_ORIGINAL_HEIGHT, start));
628 } else if (parameter == kGoogleImageOriginalWidth) { 576 } else if (parameter == "google:imageOriginalWidth") {
629 replacements->push_back( 577 replacements->push_back(
630 Replacement(TemplateURLRef::GOOGLE_IMAGE_ORIGINAL_WIDTH, start)); 578 Replacement(TemplateURLRef::GOOGLE_IMAGE_ORIGINAL_WIDTH, start));
631 } else if (parameter == kGoogleImageSearchSource) { 579 } else if (parameter == "google:imageSearchSource") {
632 replacements->push_back( 580 replacements->push_back(
633 Replacement(TemplateURLRef::GOOGLE_IMAGE_SEARCH_SOURCE, start)); 581 Replacement(TemplateURLRef::GOOGLE_IMAGE_SEARCH_SOURCE, start));
634 } else if (parameter == kGoogleImageThumbnailParameter) { 582 } else if (parameter == "google:imageThumbnail") {
635 replacements->push_back( 583 replacements->push_back(
636 Replacement(TemplateURLRef::GOOGLE_IMAGE_THUMBNAIL, start)); 584 Replacement(TemplateURLRef::GOOGLE_IMAGE_THUMBNAIL, start));
637 } else if (parameter == kGoogleImageURLParameter) { 585 } else if (parameter == "google:imageURL") {
638 replacements->push_back(Replacement(TemplateURLRef::GOOGLE_IMAGE_URL, 586 replacements->push_back(Replacement(TemplateURLRef::GOOGLE_IMAGE_URL,
639 start)); 587 start));
640 } else if (parameter == kGoogleInputTypeParameter) { 588 } else if (parameter == "google:inputType") {
641 replacements->push_back(Replacement(TemplateURLRef::GOOGLE_INPUT_TYPE, 589 replacements->push_back(Replacement(TemplateURLRef::GOOGLE_INPUT_TYPE,
642 start)); 590 start));
643 } else if (parameter == kGoogleInstantExtendedEnabledParameter) { 591 } else if (parameter == "google:instantExtendedEnabledParameter") {
644 replacements->push_back(Replacement(GOOGLE_INSTANT_EXTENDED_ENABLED, 592 replacements->push_back(Replacement(GOOGLE_INSTANT_EXTENDED_ENABLED,
645 start)); 593 start));
646 } else if (parameter == kGoogleInstantExtendedEnabledKey) { 594 } else if (parameter == "google:instantExtendedEnabledKey") {
647 url->insert(start, google_util::kInstantExtendedAPIParam); 595 url->insert(start, google_util::kInstantExtendedAPIParam);
648 } else if (parameter == kGoogleNTPIsThemedParameter) { 596 } else if (parameter == "google:ntpIsThemedParameter") {
649 replacements->push_back(Replacement(GOOGLE_NTP_IS_THEMED, start)); 597 replacements->push_back(Replacement(GOOGLE_NTP_IS_THEMED, start));
650 } else if (parameter == kGoogleOmniboxStartMarginParameter) { 598 } else if (parameter == "google:omniboxStartMarginParameter") {
651 replacements->push_back(Replacement(GOOGLE_OMNIBOX_START_MARGIN, start)); 599 replacements->push_back(Replacement(GOOGLE_OMNIBOX_START_MARGIN, start));
652 } else if (parameter == kGoogleContextualSearchVersion) { 600 } else if (parameter == "google:contextualSearchVersion") {
653 replacements->push_back( 601 replacements->push_back(
654 Replacement(GOOGLE_CONTEXTUAL_SEARCH_VERSION, start)); 602 Replacement(GOOGLE_CONTEXTUAL_SEARCH_VERSION, start));
655 } else if (parameter == kGoogleContextualSearchContextData) { 603 } else if (parameter == "google:contextualSearchContextData") {
656 replacements->push_back( 604 replacements->push_back(
657 Replacement(GOOGLE_CONTEXTUAL_SEARCH_CONTEXT_DATA, start)); 605 Replacement(GOOGLE_CONTEXTUAL_SEARCH_CONTEXT_DATA, start));
658 } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) { 606 } else if (parameter == "google:originalQueryForSuggestion") {
659 replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION, 607 replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION,
660 start)); 608 start));
661 } else if (parameter == kGooglePageClassificationParameter) { 609 } else if (parameter == "google:pageClassification") {
662 replacements->push_back(Replacement(GOOGLE_PAGE_CLASSIFICATION, start)); 610 replacements->push_back(Replacement(GOOGLE_PAGE_CLASSIFICATION, start));
663 } else if (parameter == kGooglePrefetchQuery) { 611 } else if (parameter == "google:prefetchQuery") {
664 replacements->push_back(Replacement(GOOGLE_PREFETCH_QUERY, start)); 612 replacements->push_back(Replacement(GOOGLE_PREFETCH_QUERY, start));
665 } else if (parameter == kGoogleRLZParameter) { 613 } else if (parameter == "google:RLZ") {
666 replacements->push_back(Replacement(GOOGLE_RLZ, start)); 614 replacements->push_back(Replacement(GOOGLE_RLZ, start));
667 } else if (parameter == kGoogleSearchClient) { 615 } else if (parameter == "google:searchClient") {
668 replacements->push_back(Replacement(GOOGLE_SEARCH_CLIENT, start)); 616 replacements->push_back(Replacement(GOOGLE_SEARCH_CLIENT, start));
669 } else if (parameter == kGoogleSearchFieldtrialParameter) { 617 } else if (parameter == "google:searchFieldtrialParameter") {
670 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start)); 618 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start));
671 } else if (parameter == kGoogleSearchVersion) { 619 } else if (parameter == "google:searchVersion") {
672 replacements->push_back(Replacement(GOOGLE_SEARCH_VERSION, start)); 620 replacements->push_back(Replacement(GOOGLE_SEARCH_VERSION, start));
673 } else if (parameter == kGoogleSessionToken) { 621 } else if (parameter == "google:sessionToken") {
674 replacements->push_back(Replacement(GOOGLE_SESSION_TOKEN, start)); 622 replacements->push_back(Replacement(GOOGLE_SESSION_TOKEN, start));
675 } else if (parameter == kGoogleSourceIdParameter) { 623 } else if (parameter == "google:sourceId") {
676 #if defined(OS_ANDROID) || defined(OS_IOS) 624 #if defined(OS_ANDROID) || defined(OS_IOS)
677 url->insert(start, "sourceid=chrome-mobile&"); 625 url->insert(start, "sourceid=chrome-mobile&");
678 #else 626 #else
679 url->insert(start, "sourceid=chrome&"); 627 url->insert(start, "sourceid=chrome&");
680 #endif 628 #endif
681 } else if (parameter == kGoogleSuggestAPIKeyParameter) { 629 } else if (parameter == "google:suggestAPIKeyParameter") {
682 url->insert(start, 630 url->insert(start,
683 net::EscapeQueryParamValue(google_apis::GetAPIKey(), false)); 631 net::EscapeQueryParamValue(google_apis::GetAPIKey(), false));
684 } else if (parameter == kGoogleSuggestClient) { 632 } else if (parameter == "google:suggestClient") {
685 replacements->push_back(Replacement(GOOGLE_SUGGEST_CLIENT, start)); 633 replacements->push_back(Replacement(GOOGLE_SUGGEST_CLIENT, start));
686 } else if (parameter == kGoogleSuggestRequestId) { 634 } else if (parameter == "google:suggestRid") {
687 replacements->push_back(Replacement(GOOGLE_SUGGEST_REQUEST_ID, start)); 635 replacements->push_back(Replacement(GOOGLE_SUGGEST_REQUEST_ID, start));
688 } else if (parameter == kGoogleUnescapedSearchTermsParameter) { 636 } else if (parameter == kGoogleUnescapedSearchTermsParameter) {
689 replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start)); 637 replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start));
690 } else if (parameter == "yandex:searchPath") { 638 } else if (parameter == "yandex:searchPath") {
691 switch (ui::GetDeviceFormFactor()) { 639 switch (ui::GetDeviceFormFactor()) {
692 case ui::DEVICE_FORM_FACTOR_DESKTOP: 640 case ui::DEVICE_FORM_FACTOR_DESKTOP:
693 url->insert(start, "yandsearch"); 641 url->insert(start, "yandsearch");
694 break; 642 break;
695 case ui::DEVICE_FORM_FACTOR_PHONE: 643 case ui::DEVICE_FORM_FACTOR_PHONE:
696 url->insert(start, "touchsearch"); 644 url->insert(start, "touchsearch");
697 break; 645 break;
698 case ui::DEVICE_FORM_FACTOR_TABLET: 646 case ui::DEVICE_FORM_FACTOR_TABLET:
699 url->insert(start, "padsearch"); 647 url->insert(start, "padsearch");
700 break; 648 break;
701 } 649 }
702 } else if (parameter == kInputEncodingParameter) { 650 } else if (parameter == "inputEncoding") {
703 replacements->push_back(Replacement(ENCODING, start)); 651 replacements->push_back(Replacement(ENCODING, start));
704 } else if (parameter == kLanguageParameter) { 652 } else if (parameter == "language") {
705 replacements->push_back(Replacement(LANGUAGE, start)); 653 replacements->push_back(Replacement(LANGUAGE, start));
706 } else if (parameter == kOutputEncodingParameter) { 654 } else if (parameter == "outputEncoding") {
707 if (!optional) 655 if (!optional)
708 url->insert(start, kOutputEncodingType); 656 url->insert(start, kOutputEncodingType);
709 } else if ((parameter == kStartIndexParameter) || 657 } else if ((parameter == "startIndex") || (parameter == "startPage")) {
710 (parameter == kStartPageParameter)) {
711 // We don't support these. 658 // We don't support these.
712 if (!optional) 659 if (!optional)
713 url->insert(start, "1"); 660 url->insert(start, "1");
714 } else if (!prepopulated_) { 661 } else if (!prepopulated_) {
715 // If it's a prepopulated URL, we know that it's safe to remove unknown 662 // If it's a prepopulated URL, we know that it's safe to remove unknown
716 // parameters, so just ignore this and return true below. Otherwise it could 663 // parameters, so just ignore this and return true below. Otherwise it could
717 // be some garbage but can also be a javascript block. Put it back. 664 // be some garbage but can also be a javascript block. Put it back.
718 url->insert(start, full_parameter); 665 url->insert(start, full_parameter);
719 return false; 666 return false;
720 } 667 }
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 // could be more than one term, but it's uncommon; so we punt. 762 // could be more than one term, but it's uncommon; so we punt.
816 if (has_only_one_search_term) 763 if (has_only_one_search_term)
817 ParseHostAndSearchTermKey(search_terms_data); 764 ParseHostAndSearchTermKey(search_terms_data);
818 } 765 }
819 } 766 }
820 } 767 }
821 768
822 void TemplateURLRef::ParseHostAndSearchTermKey( 769 void TemplateURLRef::ParseHostAndSearchTermKey(
823 const SearchTermsData& search_terms_data) const { 770 const SearchTermsData& search_terms_data) const {
824 std::string url_string(GetURL()); 771 std::string url_string(GetURL());
825 ReplaceSubstringsAfterOffset(&url_string, 0, 772 ReplaceSubstringsAfterOffset(&url_string, 0, "{google:baseURL}",
826 kGoogleBaseURLParameterFull,
827 search_terms_data.GoogleBaseURLValue()); 773 search_terms_data.GoogleBaseURLValue());
828 ReplaceSubstringsAfterOffset(&url_string, 0, 774 ReplaceSubstringsAfterOffset(&url_string, 0, "{google:baseSuggestURL}",
829 kGoogleBaseSuggestURLParameterFull,
830 search_terms_data.GoogleBaseSuggestURLValue()); 775 search_terms_data.GoogleBaseSuggestURLValue());
831 776
832 search_term_key_.clear(); 777 search_term_key_.clear();
833 search_term_position_in_path_ = std::string::npos; 778 search_term_position_in_path_ = std::string::npos;
834 host_.clear(); 779 host_.clear();
835 path_.clear(); 780 path_.clear();
836 search_term_key_location_ = url::Parsed::QUERY; 781 search_term_key_location_ = url::Parsed::QUERY;
837 782
838 GURL url(url_string); 783 GURL url(url_string);
839 if (!url.is_valid()) 784 if (!url.is_valid())
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 suggestions_url_ref_(this, 1185 suggestions_url_ref_(this,
1241 TemplateURLRef::SUGGEST), 1186 TemplateURLRef::SUGGEST),
1242 instant_url_ref_(this, 1187 instant_url_ref_(this,
1243 TemplateURLRef::INSTANT), 1188 TemplateURLRef::INSTANT),
1244 image_url_ref_(this, TemplateURLRef::IMAGE), 1189 image_url_ref_(this, TemplateURLRef::IMAGE),
1245 new_tab_url_ref_(this, TemplateURLRef::NEW_TAB), 1190 new_tab_url_ref_(this, TemplateURLRef::NEW_TAB),
1246 contextual_search_url_ref_(this, TemplateURLRef::CONTEXTUAL_SEARCH) { 1191 contextual_search_url_ref_(this, TemplateURLRef::CONTEXTUAL_SEARCH) {
1247 SetPrepopulateId(data_.prepopulate_id); 1192 SetPrepopulateId(data_.prepopulate_id);
1248 1193
1249 if (data_.search_terms_replacement_key == 1194 if (data_.search_terms_replacement_key ==
1250 kGoogleInstantExtendedEnabledKeyFull) { 1195 "{google:instantExtendedEnabledKey}") {
1251 data_.search_terms_replacement_key = google_util::kInstantExtendedAPIParam; 1196 data_.search_terms_replacement_key = google_util::kInstantExtendedAPIParam;
1252 } 1197 }
1253 } 1198 }
1254 1199
1255 TemplateURL::~TemplateURL() { 1200 TemplateURL::~TemplateURL() {
1256 } 1201 }
1257 1202
1258 // static 1203 // static
1259 base::string16 TemplateURL::GenerateKeyword(const GURL& url) { 1204 base::string16 TemplateURL::GenerateKeyword(const GURL& url) {
1260 DCHECK(url.is_valid()); 1205 DCHECK(url.is_valid());
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
1556 // patterns. This means that given patterns 1501 // patterns. This means that given patterns
1557 // [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ], 1502 // [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
1558 // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would 1503 // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
1559 // return false. This is important for at least Google, where such URLs 1504 // return false. This is important for at least Google, where such URLs
1560 // are invalid. 1505 // are invalid.
1561 return !search_terms->empty(); 1506 return !search_terms->empty();
1562 } 1507 }
1563 } 1508 }
1564 return false; 1509 return false;
1565 } 1510 }
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