| OLD | NEW |
| 1 // Copyright (c) 2011 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_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/string16.h" | 16 #include "base/string16.h" |
| 17 #include "base/utf_string_conversions.h" | 17 #include "base/utf_string_conversions.h" |
| 18 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 18 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
| 19 #include "chrome/browser/autocomplete/autocomplete_match.h" | 19 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 20 #include "chrome/browser/autocomplete/keyword_provider.h" | 20 #include "chrome/browser/autocomplete/keyword_provider.h" |
| 21 #include "chrome/browser/history/history.h" | 21 #include "chrome/browser/history/history.h" |
| 22 #include "chrome/browser/instant/instant_controller.h" | 22 #include "chrome/browser/instant/instant_controller.h" |
| 23 #include "chrome/browser/net/url_fixer_upper.h" | 23 #include "chrome/browser/net/url_fixer_upper.h" |
| 24 #include "chrome/browser/prefs/pref_service.h" | 24 #include "chrome/browser/prefs/pref_service.h" |
| (...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 943 | 943 |
| 944 return match; | 944 return match; |
| 945 } | 945 } |
| 946 | 946 |
| 947 void SearchProvider::UpdateDone() { | 947 void SearchProvider::UpdateDone() { |
| 948 // We're done when there are no more suggest queries pending (this is set to 1 | 948 // We're done when there are no more suggest queries pending (this is set to 1 |
| 949 // when the timer is started) and we're not waiting on instant. | 949 // when the timer is started) and we're not waiting on instant. |
| 950 done_ = ((suggest_results_pending_ == 0) && | 950 done_ = ((suggest_results_pending_ == 0) && |
| 951 (instant_finalized_ || !InstantController::IsEnabled(profile_))); | 951 (instant_finalized_ || !InstantController::IsEnabled(profile_))); |
| 952 } | 952 } |
| OLD | NEW |