| 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/autocomplete_controller.h" | 5 #include "components/omnibox/autocomplete_controller.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/format_macros.h" | 10 #include "base/format_macros.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
| 13 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
| 14 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
| 15 #include "base/time/time.h" | 15 #include "base/time/time.h" |
| 16 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h" | 16 #include "components/omnibox/autocomplete_controller_delegate.h" |
| 17 #include "chrome/browser/autocomplete/builtin_provider.h" | |
| 18 #include "chrome/browser/autocomplete/zero_suggest_provider.h" | |
| 19 #include "components/omnibox/bookmark_provider.h" | 17 #include "components/omnibox/bookmark_provider.h" |
| 18 #include "components/omnibox/builtin_provider.h" |
| 20 #include "components/omnibox/history_quick_provider.h" | 19 #include "components/omnibox/history_quick_provider.h" |
| 21 #include "components/omnibox/history_url_provider.h" | 20 #include "components/omnibox/history_url_provider.h" |
| 22 #include "components/omnibox/keyword_provider.h" | 21 #include "components/omnibox/keyword_provider.h" |
| 23 #include "components/omnibox/omnibox_field_trial.h" | 22 #include "components/omnibox/omnibox_field_trial.h" |
| 24 #include "components/omnibox/search_provider.h" | 23 #include "components/omnibox/search_provider.h" |
| 25 #include "components/omnibox/shortcuts_provider.h" | 24 #include "components/omnibox/shortcuts_provider.h" |
| 25 #include "components/omnibox/zero_suggest_provider.h" |
| 26 #include "components/search_engines/template_url.h" | 26 #include "components/search_engines/template_url.h" |
| 27 #include "components/search_engines/template_url_service.h" | 27 #include "components/search_engines/template_url_service.h" |
| 28 #include "grit/components_strings.h" | 28 #include "grit/components_strings.h" |
| 29 #include "ui/base/l10n/l10n_util.h" | 29 #include "ui/base/l10n/l10n_util.h" |
| 30 | 30 |
| 31 namespace { | 31 namespace { |
| 32 | 32 |
| 33 // Converts the given match to a type (and possibly subtype) based on the AQS | 33 // Converts the given match to a type (and possibly subtype) based on the AQS |
| 34 // specification. For more details, see | 34 // specification. For more details, see |
| 35 // http://goto.google.com/binary-clients-logging. | 35 // http://goto.google.com/binary-clients-logging. |
| (...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 638 expire_timer_.Stop(); | 638 expire_timer_.Stop(); |
| 639 stop_timer_.Stop(); | 639 stop_timer_.Stop(); |
| 640 done_ = true; | 640 done_ = true; |
| 641 if (clear_result && !result_.empty()) { | 641 if (clear_result && !result_.empty()) { |
| 642 result_.Reset(); | 642 result_.Reset(); |
| 643 // NOTE: We pass in false since we're trying to only clear the popup, not | 643 // NOTE: We pass in false since we're trying to only clear the popup, not |
| 644 // touch the edit... this is all a mess and should be cleaned up :( | 644 // touch the edit... this is all a mess and should be cleaned up :( |
| 645 NotifyChanged(false); | 645 NotifyChanged(false); |
| 646 } | 646 } |
| 647 } | 647 } |
| OLD | NEW |