| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_edit.h" | 5 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
| 12 #include "chrome/app/chrome_dll_resource.h" | 12 #include "chrome/app/chrome_dll_resource.h" |
| 13 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 13 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
| 14 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" | 14 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" |
| 15 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" | 15 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" |
| 16 #include "chrome/browser/autocomplete/keyword_provider.h" | 16 #include "chrome/browser/autocomplete/keyword_provider.h" |
| 17 #include "chrome/browser/command_updater.h" | 17 #include "chrome/browser/command_updater.h" |
| 18 #include "chrome/browser/extensions/extension_omnibox_api.h" | 18 #include "chrome/browser/extensions/extension_omnibox_api.h" |
| 19 #include "chrome/browser/metrics/user_metrics.h" | 19 #include "chrome/browser/metrics/user_metrics.h" |
| 20 #include "chrome/browser/net/dns_global.h" | 20 #include "chrome/browser/net/predictor_api.h" |
| 21 #include "chrome/browser/net/url_fixer_upper.h" | 21 #include "chrome/browser/net/url_fixer_upper.h" |
| 22 #include "chrome/browser/profile.h" | 22 #include "chrome/browser/profile.h" |
| 23 #include "chrome/browser/search_engines/template_url.h" | 23 #include "chrome/browser/search_engines/template_url.h" |
| 24 #include "chrome/browser/search_engines/template_url_model.h" | 24 #include "chrome/browser/search_engines/template_url_model.h" |
| 25 #include "chrome/common/notification_service.h" | 25 #include "chrome/common/notification_service.h" |
| 26 #include "chrome/common/url_constants.h" | 26 #include "chrome/common/url_constants.h" |
| 27 #include "googleurl/src/gurl.h" | 27 #include "googleurl/src/gurl.h" |
| 28 #include "googleurl/src/url_util.h" | 28 #include "googleurl/src/url_util.h" |
| 29 #include "third_party/skia/include/core/SkBitmap.h" | 29 #include "third_party/skia/include/core/SkBitmap.h" |
| 30 | 30 |
| (...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 676 AutocompleteMatch* match, | 676 AutocompleteMatch* match, |
| 677 GURL* alternate_nav_url) const { | 677 GURL* alternate_nav_url) const { |
| 678 if (popup_->IsOpen() || query_in_progress()) { | 678 if (popup_->IsOpen() || query_in_progress()) { |
| 679 popup_->InfoForCurrentSelection(match, alternate_nav_url); | 679 popup_->InfoForCurrentSelection(match, alternate_nav_url); |
| 680 } else { | 680 } else { |
| 681 profile_->GetAutocompleteClassifier()->Classify( | 681 profile_->GetAutocompleteClassifier()->Classify( |
| 682 UserTextFromDisplayText(view_->GetText()), GetDesiredTLD(), match, | 682 UserTextFromDisplayText(view_->GetText()), GetDesiredTLD(), match, |
| 683 alternate_nav_url); | 683 alternate_nav_url); |
| 684 } | 684 } |
| 685 } | 685 } |
| OLD | NEW |