OLD | NEW |
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/format_macros.h" | 7 #include "base/format_macros.h" |
8 #include "base/guid.h" | 8 #include "base/guid.h" |
9 #include "base/i18n/case_conversion.h" | 9 #include "base/i18n/case_conversion.h" |
10 #include "base/i18n/icu_string_conversions.h" | 10 #include "base/i18n/icu_string_conversions.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 const char kGoogleBaseURLParameter[] = "google:baseURL"; | 51 const char kGoogleBaseURLParameter[] = "google:baseURL"; |
52 const char kGoogleBaseURLParameterFull[] = "{google:baseURL}"; | 52 const char kGoogleBaseURLParameterFull[] = "{google:baseURL}"; |
53 | 53 |
54 // Like google:baseURL, but for the Search Suggest capability. | 54 // Like google:baseURL, but for the Search Suggest capability. |
55 const char kGoogleBaseSuggestURLParameter[] = "google:baseSuggestURL"; | 55 const char kGoogleBaseSuggestURLParameter[] = "google:baseSuggestURL"; |
56 const char kGoogleBaseSuggestURLParameterFull[] = "{google:baseSuggestURL}"; | 56 const char kGoogleBaseSuggestURLParameterFull[] = "{google:baseSuggestURL}"; |
57 const char kGoogleCursorPositionParameter[] = "google:cursorPosition"; | 57 const char kGoogleCursorPositionParameter[] = "google:cursorPosition"; |
58 const char kGoogleInstantEnabledParameter[] = "google:instantEnabledParameter"; | 58 const char kGoogleInstantEnabledParameter[] = "google:instantEnabledParameter"; |
59 const char kGoogleInstantExtendedEnabledParameter[] = | 59 const char kGoogleInstantExtendedEnabledParameter[] = |
60 "google:instantExtendedEnabledParameter"; | 60 "google:instantExtendedEnabledParameter"; |
| 61 const char kGoogleInstantExtendedEnabledKey[] = |
| 62 "google:instantExtendedEnabledKey"; |
61 const char kGoogleOriginalQueryForSuggestionParameter[] = | 63 const char kGoogleOriginalQueryForSuggestionParameter[] = |
62 "google:originalQueryForSuggestion"; | 64 "google:originalQueryForSuggestion"; |
63 const char kGoogleRLZParameter[] = "google:RLZ"; | 65 const char kGoogleRLZParameter[] = "google:RLZ"; |
64 const char kGoogleSearchClient[] = "google:searchClient"; | 66 const char kGoogleSearchClient[] = "google:searchClient"; |
65 const char kGoogleSearchFieldtrialParameter[] = | 67 const char kGoogleSearchFieldtrialParameter[] = |
66 "google:searchFieldtrialParameter"; | 68 "google:searchFieldtrialParameter"; |
67 const char kGoogleSourceIdParameter[] = "google:sourceId"; | 69 const char kGoogleSourceIdParameter[] = "google:sourceId"; |
68 const char kGoogleSuggestAPIKeyParameter[] = "google:suggestAPIKeyParameter"; | 70 const char kGoogleSuggestAPIKeyParameter[] = "google:suggestAPIKeyParameter"; |
69 | 71 |
70 // Same as kSearchTermsParameter, with no escaping. | 72 // Same as kSearchTermsParameter, with no escaping. |
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
564 replacements->push_back(Replacement(GOOGLE_BASE_URL, start)); | 566 replacements->push_back(Replacement(GOOGLE_BASE_URL, start)); |
565 } else if (parameter == kGoogleBaseSuggestURLParameter) { | 567 } else if (parameter == kGoogleBaseSuggestURLParameter) { |
566 replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start)); | 568 replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start)); |
567 } else if (parameter == kGoogleCursorPositionParameter) { | 569 } else if (parameter == kGoogleCursorPositionParameter) { |
568 replacements->push_back(Replacement(GOOGLE_CURSOR_POSITION, start)); | 570 replacements->push_back(Replacement(GOOGLE_CURSOR_POSITION, start)); |
569 } else if (parameter == kGoogleInstantEnabledParameter) { | 571 } else if (parameter == kGoogleInstantEnabledParameter) { |
570 replacements->push_back(Replacement(GOOGLE_INSTANT_ENABLED, start)); | 572 replacements->push_back(Replacement(GOOGLE_INSTANT_ENABLED, start)); |
571 } else if (parameter == kGoogleInstantExtendedEnabledParameter) { | 573 } else if (parameter == kGoogleInstantExtendedEnabledParameter) { |
572 replacements->push_back(Replacement(GOOGLE_INSTANT_EXTENDED_ENABLED, | 574 replacements->push_back(Replacement(GOOGLE_INSTANT_EXTENDED_ENABLED, |
573 start)); | 575 start)); |
| 576 } else if (parameter == kGoogleInstantExtendedEnabledKey) { |
| 577 url->insert(start, google_util::kInstantExtendedAPIParam); |
574 } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) { | 578 } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) { |
575 replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION, | 579 replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION, |
576 start)); | 580 start)); |
577 } else if (parameter == kGoogleRLZParameter) { | 581 } else if (parameter == kGoogleRLZParameter) { |
578 replacements->push_back(Replacement(GOOGLE_RLZ, start)); | 582 replacements->push_back(Replacement(GOOGLE_RLZ, start)); |
579 } else if (parameter == kGoogleSearchClient) { | 583 } else if (parameter == kGoogleSearchClient) { |
580 replacements->push_back(Replacement(GOOGLE_SEARCH_CLIENT, start)); | 584 replacements->push_back(Replacement(GOOGLE_SEARCH_CLIENT, start)); |
581 } else if (parameter == kGoogleSearchFieldtrialParameter) { | 585 } else if (parameter == kGoogleSearchFieldtrialParameter) { |
582 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start)); | 586 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start)); |
583 } else if (parameter == kGoogleSuggestAPIKeyParameter) { | 587 } else if (parameter == kGoogleSuggestAPIKeyParameter) { |
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
866 } | 870 } |
867 | 871 |
868 void TemplateURL::ResetKeywordIfNecessary(bool force) { | 872 void TemplateURL::ResetKeywordIfNecessary(bool force) { |
869 if (IsGoogleSearchURLWithReplaceableKeyword() || force) { | 873 if (IsGoogleSearchURLWithReplaceableKeyword() || force) { |
870 DCHECK(!IsExtensionKeyword()); | 874 DCHECK(!IsExtensionKeyword()); |
871 GURL url(TemplateURLService::GenerateSearchURL(this)); | 875 GURL url(TemplateURLService::GenerateSearchURL(this)); |
872 if (url.is_valid()) | 876 if (url.is_valid()) |
873 data_.SetKeyword(TemplateURLService::GenerateKeyword(url)); | 877 data_.SetKeyword(TemplateURLService::GenerateKeyword(url)); |
874 } | 878 } |
875 } | 879 } |
OLD | NEW |