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" |
11 #include "base/i18n/break_iterator.h" | 11 #include "base/i18n/break_iterator.h" |
12 #include "base/i18n/case_conversion.h" | 12 #include "base/i18n/case_conversion.h" |
13 #include "base/i18n/icu_string_conversions.h" | 13 #include "base/i18n/icu_string_conversions.h" |
14 #include "base/json/json_string_value_serializer.h" | 14 #include "base/json/json_string_value_serializer.h" |
15 #include "base/message_loop.h" | 15 #include "base/message_loop.h" |
16 #include "base/metrics/histogram.h" | 16 #include "base/metrics/histogram.h" |
| 17 #include "base/prefs/pref_service.h" |
17 #include "base/string16.h" | 18 #include "base/string16.h" |
18 #include "base/string_util.h" | 19 #include "base/string_util.h" |
19 #include "base/utf_string_conversions.h" | 20 #include "base/utf_string_conversions.h" |
20 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 21 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
21 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 22 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
22 #include "chrome/browser/autocomplete/autocomplete_field_trial.h" | 23 #include "chrome/browser/autocomplete/autocomplete_field_trial.h" |
23 #include "chrome/browser/autocomplete/autocomplete_match.h" | 24 #include "chrome/browser/autocomplete/autocomplete_match.h" |
24 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" | 25 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" |
25 #include "chrome/browser/autocomplete/autocomplete_result.h" | 26 #include "chrome/browser/autocomplete/autocomplete_result.h" |
26 #include "chrome/browser/autocomplete/history_url_provider.h" | 27 #include "chrome/browser/autocomplete/history_url_provider.h" |
27 #include "chrome/browser/autocomplete/keyword_provider.h" | 28 #include "chrome/browser/autocomplete/keyword_provider.h" |
28 #include "chrome/browser/autocomplete/url_prefix.h" | 29 #include "chrome/browser/autocomplete/url_prefix.h" |
29 #include "chrome/browser/history/history_service.h" | 30 #include "chrome/browser/history/history_service.h" |
30 #include "chrome/browser/history/history_service_factory.h" | 31 #include "chrome/browser/history/history_service_factory.h" |
31 #include "chrome/browser/history/in_memory_database.h" | 32 #include "chrome/browser/history/in_memory_database.h" |
32 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" | 33 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" |
33 #include "chrome/browser/net/url_fixer_upper.h" | 34 #include "chrome/browser/net/url_fixer_upper.h" |
34 #include "chrome/browser/prefs/pref_service.h" | |
35 #include "chrome/browser/profiles/profile.h" | 35 #include "chrome/browser/profiles/profile.h" |
36 #include "chrome/browser/search_engines/search_engine_type.h" | 36 #include "chrome/browser/search_engines/search_engine_type.h" |
37 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 37 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
38 #include "chrome/browser/search_engines/template_url_service.h" | 38 #include "chrome/browser/search_engines/template_url_service.h" |
39 #include "chrome/browser/search_engines/template_url_service_factory.h" | 39 #include "chrome/browser/search_engines/template_url_service_factory.h" |
40 #include "chrome/browser/ui/browser_instant_controller.h" | 40 #include "chrome/browser/ui/browser_instant_controller.h" |
41 #include "chrome/browser/ui/search/search.h" | 41 #include "chrome/browser/ui/search/search.h" |
42 #include "chrome/common/pref_names.h" | 42 #include "chrome/common/pref_names.h" |
43 #include "chrome/common/url_constants.h" | 43 #include "chrome/common/url_constants.h" |
44 #include "googleurl/src/url_util.h" | 44 #include "googleurl/src/url_util.h" |
(...skipping 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1346 } | 1346 } |
1347 | 1347 |
1348 void SearchProvider::UpdateDone() { | 1348 void SearchProvider::UpdateDone() { |
1349 // We're done when the timer isn't running, there are no suggest queries | 1349 // We're done when the timer isn't running, there are no suggest queries |
1350 // pending, and we're not waiting on instant. | 1350 // pending, and we're not waiting on instant. |
1351 done_ = (!timer_.IsRunning() && (suggest_results_pending_ == 0) && | 1351 done_ = (!timer_.IsRunning() && (suggest_results_pending_ == 0) && |
1352 (instant_finalized_ || | 1352 (instant_finalized_ || |
1353 (!chrome::BrowserInstantController::IsInstantEnabled(profile_) && | 1353 (!chrome::BrowserInstantController::IsInstantEnabled(profile_) && |
1354 !chrome::search::IsInstantExtendedAPIEnabled(profile_)))); | 1354 !chrome::search::IsInstantExtendedAPIEnabled(profile_)))); |
1355 } | 1355 } |
OLD | NEW |