OLD | NEW |
---|---|
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/autocomplete/search_provider.h" | 5 #include "chrome/browser/autocomplete/search_provider.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/base64.h" | |
10 #include "base/callback.h" | 11 #include "base/callback.h" |
12 #include "base/command_line.h" | |
11 #include "base/i18n/break_iterator.h" | 13 #include "base/i18n/break_iterator.h" |
12 #include "base/i18n/case_conversion.h" | 14 #include "base/i18n/case_conversion.h" |
13 #include "base/json/json_string_value_serializer.h" | 15 #include "base/json/json_string_value_serializer.h" |
14 #include "base/message_loop/message_loop.h" | 16 #include "base/message_loop/message_loop.h" |
15 #include "base/metrics/histogram.h" | 17 #include "base/metrics/histogram.h" |
16 #include "base/prefs/pref_service.h" | 18 #include "base/prefs/pref_service.h" |
19 #include "base/rand_util.h" | |
17 #include "base/strings/string_util.h" | 20 #include "base/strings/string_util.h" |
18 #include "base/strings/utf_string_conversions.h" | 21 #include "base/strings/utf_string_conversions.h" |
19 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 22 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
20 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 23 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
21 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" | 24 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" |
22 #include "chrome/browser/autocomplete/autocomplete_result.h" | 25 #include "chrome/browser/autocomplete/autocomplete_result.h" |
23 #include "chrome/browser/autocomplete/keyword_provider.h" | 26 #include "chrome/browser/autocomplete/keyword_provider.h" |
24 #include "chrome/browser/autocomplete/url_prefix.h" | 27 #include "chrome/browser/autocomplete/url_prefix.h" |
25 #include "chrome/browser/google/google_util.h" | 28 #include "chrome/browser/google/google_util.h" |
26 #include "chrome/browser/history/history_service.h" | 29 #include "chrome/browser/history/history_service.h" |
27 #include "chrome/browser/history/history_service_factory.h" | 30 #include "chrome/browser/history/history_service_factory.h" |
28 #include "chrome/browser/history/in_memory_database.h" | 31 #include "chrome/browser/history/in_memory_database.h" |
29 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" | 32 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" |
30 #include "chrome/browser/omnibox/omnibox_field_trial.h" | 33 #include "chrome/browser/omnibox/omnibox_field_trial.h" |
31 #include "chrome/browser/profiles/profile.h" | 34 #include "chrome/browser/profiles/profile.h" |
32 #include "chrome/browser/search/search.h" | 35 #include "chrome/browser/search/search.h" |
33 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 36 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
34 #include "chrome/browser/search_engines/template_url_service.h" | 37 #include "chrome/browser/search_engines/template_url_service.h" |
35 #include "chrome/browser/search_engines/template_url_service_factory.h" | 38 #include "chrome/browser/search_engines/template_url_service_factory.h" |
36 #include "chrome/browser/ui/search/instant_controller.h" | 39 #include "chrome/browser/ui/search/instant_controller.h" |
40 #include "chrome/common/chrome_switches.h" | |
37 #include "chrome/common/pref_names.h" | 41 #include "chrome/common/pref_names.h" |
38 #include "chrome/common/url_constants.h" | 42 #include "chrome/common/url_constants.h" |
39 #include "content/public/browser/user_metrics.h" | 43 #include "content/public/browser/user_metrics.h" |
40 #include "grit/generated_resources.h" | 44 #include "grit/generated_resources.h" |
41 #include "net/base/escape.h" | 45 #include "net/base/escape.h" |
42 #include "net/base/load_flags.h" | 46 #include "net/base/load_flags.h" |
43 #include "net/base/net_util.h" | 47 #include "net/base/net_util.h" |
44 #include "net/http/http_request_headers.h" | 48 #include "net/http/http_request_headers.h" |
45 #include "net/url_request/url_fetcher.h" | 49 #include "net/url_request/url_fetcher.h" |
46 #include "net/url_request/url_request_status.h" | 50 #include "net/url_request/url_request_status.h" |
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
630 int id, | 634 int id, |
631 const TemplateURL* template_url, | 635 const TemplateURL* template_url, |
632 const AutocompleteInput& input) { | 636 const AutocompleteInput& input) { |
633 if (!template_url || template_url->suggestions_url().empty()) | 637 if (!template_url || template_url->suggestions_url().empty()) |
634 return NULL; | 638 return NULL; |
635 | 639 |
636 // Bail if the suggestion URL is invalid with the given replacements. | 640 // Bail if the suggestion URL is invalid with the given replacements. |
637 TemplateURLRef::SearchTermsArgs search_term_args(input.text()); | 641 TemplateURLRef::SearchTermsArgs search_term_args(input.text()); |
638 search_term_args.cursor_position = input.cursor_position(); | 642 search_term_args.cursor_position = input.cursor_position(); |
639 search_term_args.page_classification = input.current_page_classification(); | 643 search_term_args.page_classification = input.current_page_classification(); |
644 #if defined(OS_ANDROID) | |
Peter Kasting
2014/05/09 21:35:07
Why is this ifdef necessary? It seems harmless to
groby-ooo-7-16
2014/05/09 21:50:25
That's because the switch is Android-only :)
It
Peter Kasting
2014/05/09 22:29:24
Fine with me.
| |
645 if (CommandLine::ForCurrentProcess()->HasSwitch( | |
646 switches::kEnableAnswersInSuggest)) | |
Peter Kasting
2014/05/09 21:35:07
Nit: Indent 4, not 8
groby-ooo-7-16
2014/05/09 22:18:09
Done.
| |
647 search_term_args.session_token = GetSessionToken(); | |
648 #endif | |
640 GURL suggest_url(template_url->suggestions_url_ref().ReplaceSearchTerms( | 649 GURL suggest_url(template_url->suggestions_url_ref().ReplaceSearchTerms( |
641 search_term_args)); | 650 search_term_args)); |
642 if (!suggest_url.is_valid()) | 651 if (!suggest_url.is_valid()) |
643 return NULL; | 652 return NULL; |
644 // Send the current page URL if user setting and URL requirements are met and | 653 // Send the current page URL if user setting and URL requirements are met and |
645 // the user is in the field trial. | 654 // the user is in the field trial. |
646 if (CanSendURL(current_page_url_, suggest_url, template_url, | 655 if (CanSendURL(current_page_url_, suggest_url, template_url, |
647 input.current_page_classification(), profile_) && | 656 input.current_page_classification(), profile_) && |
648 OmniboxFieldTrial::InZeroSuggestAfterTypingFieldTrial()) { | 657 OmniboxFieldTrial::InZeroSuggestAfterTypingFieldTrial()) { |
649 search_term_args.current_page_url = current_page_url_.spec(); | 658 search_term_args.current_page_url = current_page_url_.spec(); |
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1123 match.RecordAdditionalInfo(kShouldPrefetchKey, kFalse); | 1132 match.RecordAdditionalInfo(kShouldPrefetchKey, kFalse); |
1124 | 1133 |
1125 return match; | 1134 return match; |
1126 } | 1135 } |
1127 | 1136 |
1128 void SearchProvider::UpdateDone() { | 1137 void SearchProvider::UpdateDone() { |
1129 // We're done when the timer isn't running, there are no suggest queries | 1138 // We're done when the timer isn't running, there are no suggest queries |
1130 // pending, and we're not waiting on Instant. | 1139 // pending, and we're not waiting on Instant. |
1131 done_ = !timer_.IsRunning() && (suggest_results_pending_ == 0); | 1140 done_ = !timer_.IsRunning() && (suggest_results_pending_ == 0); |
1132 } | 1141 } |
1142 | |
1143 std::string SearchProvider::GetSessionToken() { | |
1144 // Renew token if it expired. | |
1145 if (base::Time::Now() > token_expiration_time_) { | |
Peter Kasting
2014/05/09 21:35:07
Time::Now() can go backward (e.g. for DST), leavin
groby-ooo-7-16
2014/05/09 21:50:25
I picked Time because it's not affected by suspens
groby-ooo-7-16
2014/05/09 22:18:09
Done - TimeTicks
| |
1146 const int kTokenBytes = 12; | |
Peter Kasting
2014/05/09 21:35:07
This should be a size_t
groby-ooo-7-16
2014/05/09 22:18:09
Done.
| |
1147 std::string raw_data; | |
1148 base::RandBytes(WriteInto(&raw_data, kTokenBytes + 1), kTokenBytes); | |
1149 base::Base64Encode(raw_data, ¤t_token_); | |
1150 } | |
1151 | |
1152 // Extend expiration time another 60 seconds. | |
1153 token_expiration_time_ = base::Time::Now() + base::TimeDelta::FromSeconds(60); | |
Peter Kasting
2014/05/09 21:35:07
Fetch the time once atop the function instead of c
groby-ooo-7-16
2014/05/09 22:18:09
Done.
| |
1154 | |
1155 return current_token_; | |
1156 } | |
OLD | NEW |