| 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/i18n/case_conversion.h" | 7 #include "base/i18n/case_conversion.h" |
| 8 #include "base/i18n/icu_string_conversions.h" | 8 #include "base/i18n/icu_string_conversions.h" |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 // Host/Domain Google searches are relative to. | 48 // Host/Domain Google searches are relative to. |
| 49 static const char kGoogleBaseURLParameter[] = "google:baseURL"; | 49 static const char kGoogleBaseURLParameter[] = "google:baseURL"; |
| 50 static const char kGoogleBaseURLParameterFull[] = "{google:baseURL}"; | 50 static const char kGoogleBaseURLParameterFull[] = "{google:baseURL}"; |
| 51 // Like google:baseURL, but for the Search Suggest capability. | 51 // Like google:baseURL, but for the Search Suggest capability. |
| 52 static const char kGoogleBaseSuggestURLParameter[] = | 52 static const char kGoogleBaseSuggestURLParameter[] = |
| 53 "google:baseSuggestURL"; | 53 "google:baseSuggestURL"; |
| 54 static const char kGoogleBaseSuggestURLParameterFull[] = | 54 static const char kGoogleBaseSuggestURLParameterFull[] = |
| 55 "{google:baseSuggestURL}"; | 55 "{google:baseSuggestURL}"; |
| 56 static const char kGoogleInstantEnabledParameter[] = | 56 static const char kGoogleInstantEnabledParameter[] = |
| 57 "google:instantEnabledParameter"; | 57 "google:instantEnabledParameter"; |
| 58 static const char kGoogleInstantFieldTrialGroupParameter[] = | |
| 59 "google:instantFieldTrialGroupParameter"; | |
| 60 static const char kGoogleOriginalQueryForSuggestionParameter[] = | 58 static const char kGoogleOriginalQueryForSuggestionParameter[] = |
| 61 "google:originalQueryForSuggestion"; | 59 "google:originalQueryForSuggestion"; |
| 62 static const char kGoogleRLZParameter[] = "google:RLZ"; | 60 static const char kGoogleRLZParameter[] = "google:RLZ"; |
| 63 // Same as kSearchTermsParameter, with no escaping. | 61 // Same as kSearchTermsParameter, with no escaping. |
| 64 static const char kGoogleSearchFieldtrialParameter[] = | 62 static const char kGoogleSearchFieldtrialParameter[] = |
| 65 "google:searchFieldtrialParameter"; | 63 "google:searchFieldtrialParameter"; |
| 66 static const char kGoogleUnescapedSearchTermsParameter[] = | 64 static const char kGoogleUnescapedSearchTermsParameter[] = |
| 67 "google:unescapedSearchTerms"; | 65 "google:unescapedSearchTerms"; |
| 68 static const char kGoogleUnescapedSearchTermsParameterFull[] = | 66 static const char kGoogleUnescapedSearchTermsParameterFull[] = |
| 69 "{google:unescapedSearchTerms}"; | 67 "{google:unescapedSearchTerms}"; |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 break; | 200 break; |
| 203 | 201 |
| 204 case GOOGLE_BASE_SUGGEST_URL: | 202 case GOOGLE_BASE_SUGGEST_URL: |
| 205 url.insert(i->index, search_terms_data.GoogleBaseSuggestURLValue()); | 203 url.insert(i->index, search_terms_data.GoogleBaseSuggestURLValue()); |
| 206 break; | 204 break; |
| 207 | 205 |
| 208 case GOOGLE_INSTANT_ENABLED: | 206 case GOOGLE_INSTANT_ENABLED: |
| 209 url.insert(i->index, search_terms_data.InstantEnabledParam()); | 207 url.insert(i->index, search_terms_data.InstantEnabledParam()); |
| 210 break; | 208 break; |
| 211 | 209 |
| 212 case GOOGLE_INSTANT_FIELD_TRIAL_GROUP: | |
| 213 url.insert(i->index, search_terms_data.InstantFieldTrialUrlParam()); | |
| 214 break; | |
| 215 | |
| 216 case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION: | 210 case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION: |
| 217 if (accepted_suggestion >= 0) | 211 if (accepted_suggestion >= 0) |
| 218 url.insert(i->index, "oq=" + UTF16ToUTF8(encoded_original_query) + | 212 url.insert(i->index, "oq=" + UTF16ToUTF8(encoded_original_query) + |
| 219 "&"); | 213 "&"); |
| 220 break; | 214 break; |
| 221 | 215 |
| 222 case GOOGLE_RLZ: { | 216 case GOOGLE_RLZ: { |
| 223 // On platforms that don't have RLZ, we still want this branch | 217 // On platforms that don't have RLZ, we still want this branch |
| 224 // to happen so that we replace the RLZ template with the | 218 // to happen so that we replace the RLZ template with the |
| 225 // empty string. (If we don't handle this case, we hit a | 219 // empty string. (If we don't handle this case, we hit a |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 if (!optional) | 416 if (!optional) |
| 423 url->insert(start, kOutputEncodingType); | 417 url->insert(start, kOutputEncodingType); |
| 424 } else if (parameter == kGoogleAcceptedSuggestionParameter) { | 418 } else if (parameter == kGoogleAcceptedSuggestionParameter) { |
| 425 replacements->push_back(Replacement(GOOGLE_ACCEPTED_SUGGESTION, start)); | 419 replacements->push_back(Replacement(GOOGLE_ACCEPTED_SUGGESTION, start)); |
| 426 } else if (parameter == kGoogleBaseURLParameter) { | 420 } else if (parameter == kGoogleBaseURLParameter) { |
| 427 replacements->push_back(Replacement(GOOGLE_BASE_URL, start)); | 421 replacements->push_back(Replacement(GOOGLE_BASE_URL, start)); |
| 428 } else if (parameter == kGoogleBaseSuggestURLParameter) { | 422 } else if (parameter == kGoogleBaseSuggestURLParameter) { |
| 429 replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start)); | 423 replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start)); |
| 430 } else if (parameter == kGoogleInstantEnabledParameter) { | 424 } else if (parameter == kGoogleInstantEnabledParameter) { |
| 431 replacements->push_back(Replacement(GOOGLE_INSTANT_ENABLED, start)); | 425 replacements->push_back(Replacement(GOOGLE_INSTANT_ENABLED, start)); |
| 432 } else if (parameter == kGoogleInstantFieldTrialGroupParameter) { | |
| 433 replacements->push_back(Replacement(GOOGLE_INSTANT_FIELD_TRIAL_GROUP, | |
| 434 start)); | |
| 435 } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) { | 426 } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) { |
| 436 replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION, | 427 replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION, |
| 437 start)); | 428 start)); |
| 438 } else if (parameter == kGoogleRLZParameter) { | 429 } else if (parameter == kGoogleRLZParameter) { |
| 439 replacements->push_back(Replacement(GOOGLE_RLZ, start)); | 430 replacements->push_back(Replacement(GOOGLE_RLZ, start)); |
| 440 } else if (parameter == kGoogleSearchFieldtrialParameter) { | 431 } else if (parameter == kGoogleSearchFieldtrialParameter) { |
| 441 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start)); | 432 replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start)); |
| 442 } else if (parameter == kGoogleUnescapedSearchTermsParameter) { | 433 } else if (parameter == kGoogleUnescapedSearchTermsParameter) { |
| 443 replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start)); | 434 replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start)); |
| 444 } else { | 435 } else { |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 suggestions_url_ref_.prepopulated_ = prepopulated; | 700 suggestions_url_ref_.prepopulated_ = prepopulated; |
| 710 instant_url_ref_.prepopulated_ = prepopulated; | 701 instant_url_ref_.prepopulated_ = prepopulated; |
| 711 } | 702 } |
| 712 | 703 |
| 713 void TemplateURL::InvalidateCachedValues() { | 704 void TemplateURL::InvalidateCachedValues() { |
| 714 url_ref_.InvalidateCachedValues(); | 705 url_ref_.InvalidateCachedValues(); |
| 715 suggestions_url_ref_.InvalidateCachedValues(); | 706 suggestions_url_ref_.InvalidateCachedValues(); |
| 716 instant_url_ref_.InvalidateCachedValues(); | 707 instant_url_ref_.InvalidateCachedValues(); |
| 717 data_.SetAutogenerateKeyword(data_.autogenerate_keyword()); | 708 data_.SetAutogenerateKeyword(data_.autogenerate_keyword()); |
| 718 } | 709 } |
| OLD | NEW |