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/callback.h" | 10 #include "base/callback.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "chrome/browser/autocomplete/autocomplete_field_trial.h" | 23 #include "chrome/browser/autocomplete/autocomplete_field_trial.h" |
24 #include "chrome/browser/autocomplete/autocomplete_match.h" | 24 #include "chrome/browser/autocomplete/autocomplete_match.h" |
25 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" | 25 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" |
26 #include "chrome/browser/autocomplete/autocomplete_result.h" | 26 #include "chrome/browser/autocomplete/autocomplete_result.h" |
27 #include "chrome/browser/autocomplete/history_url_provider.h" | 27 #include "chrome/browser/autocomplete/history_url_provider.h" |
28 #include "chrome/browser/autocomplete/keyword_provider.h" | 28 #include "chrome/browser/autocomplete/keyword_provider.h" |
29 #include "chrome/browser/autocomplete/url_prefix.h" | 29 #include "chrome/browser/autocomplete/url_prefix.h" |
30 #include "chrome/browser/history/history_service.h" | 30 #include "chrome/browser/history/history_service.h" |
31 #include "chrome/browser/history/history_service_factory.h" | 31 #include "chrome/browser/history/history_service_factory.h" |
32 #include "chrome/browser/history/in_memory_database.h" | 32 #include "chrome/browser/history/in_memory_database.h" |
| 33 #include "chrome/browser/instant/search.h" |
33 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" | 34 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" |
34 #include "chrome/browser/net/url_fixer_upper.h" | 35 #include "chrome/browser/net/url_fixer_upper.h" |
35 #include "chrome/browser/profiles/profile.h" | 36 #include "chrome/browser/profiles/profile.h" |
36 #include "chrome/browser/search_engines/search_engine_type.h" | 37 #include "chrome/browser/search_engines/search_engine_type.h" |
37 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 38 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
38 #include "chrome/browser/search_engines/template_url_service.h" | 39 #include "chrome/browser/search_engines/template_url_service.h" |
39 #include "chrome/browser/search_engines/template_url_service_factory.h" | 40 #include "chrome/browser/search_engines/template_url_service_factory.h" |
40 #include "chrome/browser/ui/search/search.h" | |
41 #include "chrome/common/pref_names.h" | 41 #include "chrome/common/pref_names.h" |
42 #include "chrome/common/url_constants.h" | 42 #include "chrome/common/url_constants.h" |
43 #include "googleurl/src/url_util.h" | 43 #include "googleurl/src/url_util.h" |
44 #include "grit/generated_resources.h" | 44 #include "grit/generated_resources.h" |
45 #include "net/base/escape.h" | 45 #include "net/base/escape.h" |
46 #include "net/base/load_flags.h" | 46 #include "net/base/load_flags.h" |
47 #include "net/base/net_util.h" | 47 #include "net/base/net_util.h" |
48 #include "net/http/http_request_headers.h" | 48 #include "net/http/http_request_headers.h" |
49 #include "net/http/http_response_headers.h" | 49 #include "net/http/http_response_headers.h" |
50 #include "net/url_request/url_fetcher.h" | 50 #include "net/url_request/url_fetcher.h" |
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1391 ACMatchClassification::NONE, &match.description_class); | 1391 ACMatchClassification::NONE, &match.description_class); |
1392 return match; | 1392 return match; |
1393 } | 1393 } |
1394 | 1394 |
1395 void SearchProvider::UpdateDone() { | 1395 void SearchProvider::UpdateDone() { |
1396 // We're done when the timer isn't running, there are no suggest queries | 1396 // We're done when the timer isn't running, there are no suggest queries |
1397 // pending, and we're not waiting on Instant. | 1397 // pending, and we're not waiting on Instant. |
1398 done_ = (!timer_.IsRunning() && (suggest_results_pending_ == 0) && | 1398 done_ = (!timer_.IsRunning() && (suggest_results_pending_ == 0) && |
1399 (instant_finalized_ || !chrome::search::IsInstantEnabled(profile_))); | 1399 (instant_finalized_ || !chrome::search::IsInstantEnabled(profile_))); |
1400 } | 1400 } |
OLD | NEW |