| 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/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/string16.h" | 17 #include "base/string16.h" |
| 18 #include "base/string_util.h" | 18 #include "base/string_util.h" |
| 19 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" |
| 20 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 20 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
| 21 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 21 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
| 22 #include "chrome/browser/autocomplete/autocomplete_field_trial.h" | 22 #include "chrome/browser/autocomplete/autocomplete_field_trial.h" |
| 23 #include "chrome/browser/autocomplete/autocomplete_match.h" | 23 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 24 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" | 24 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" |
| 25 #include "chrome/browser/autocomplete/autocomplete_result.h" |
| 25 #include "chrome/browser/autocomplete/history_url_provider.h" | 26 #include "chrome/browser/autocomplete/history_url_provider.h" |
| 26 #include "chrome/browser/autocomplete/keyword_provider.h" | 27 #include "chrome/browser/autocomplete/keyword_provider.h" |
| 27 #include "chrome/browser/autocomplete/url_prefix.h" | 28 #include "chrome/browser/autocomplete/url_prefix.h" |
| 28 #include "chrome/browser/history/history.h" | 29 #include "chrome/browser/history/history.h" |
| 29 #include "chrome/browser/history/history_service_factory.h" | 30 #include "chrome/browser/history/history_service_factory.h" |
| 30 #include "chrome/browser/history/in_memory_database.h" | 31 #include "chrome/browser/history/in_memory_database.h" |
| 31 #include "chrome/browser/instant/instant_controller.h" | 32 #include "chrome/browser/instant/instant_controller.h" |
| 32 #include "chrome/browser/net/url_fixer_upper.h" | 33 #include "chrome/browser/net/url_fixer_upper.h" |
| 33 #include "chrome/browser/prefs/pref_service.h" | 34 #include "chrome/browser/prefs/pref_service.h" |
| 34 #include "chrome/browser/profiles/profile.h" | 35 #include "chrome/browser/profiles/profile.h" |
| (...skipping 1151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1186 ACMatchClassification::NONE, &match.description_class); | 1187 ACMatchClassification::NONE, &match.description_class); |
| 1187 return match; | 1188 return match; |
| 1188 } | 1189 } |
| 1189 | 1190 |
| 1190 void SearchProvider::UpdateDone() { | 1191 void SearchProvider::UpdateDone() { |
| 1191 // We're done when there are no more suggest queries pending (this is set to 1 | 1192 // We're done when there are no more suggest queries pending (this is set to 1 |
| 1192 // when the timer is started) and we're not waiting on instant. | 1193 // when the timer is started) and we're not waiting on instant. |
| 1193 done_ = ((suggest_results_pending_ == 0) && | 1194 done_ = ((suggest_results_pending_ == 0) && |
| 1194 (instant_finalized_ || !InstantController::IsEnabled(profile_))); | 1195 (instant_finalized_ || !InstantController::IsEnabled(profile_))); |
| 1195 } | 1196 } |
| OLD | NEW |