OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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.h" | 5 #include "chrome/browser/autocomplete/autocomplete.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
| 9 #include "app/l10n_util.h" |
9 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
10 #include "base/string_util.h" | 11 #include "base/string_util.h" |
11 #include "chrome/browser/autocomplete/history_url_provider.h" | 12 #include "chrome/browser/autocomplete/history_url_provider.h" |
12 #include "chrome/browser/autocomplete/history_contents_provider.h" | 13 #include "chrome/browser/autocomplete/history_contents_provider.h" |
13 #include "chrome/browser/autocomplete/keyword_provider.h" | 14 #include "chrome/browser/autocomplete/keyword_provider.h" |
14 #include "chrome/browser/autocomplete/search_provider.h" | 15 #include "chrome/browser/autocomplete/search_provider.h" |
15 #include "chrome/browser/bookmarks/bookmark_model.h" | 16 #include "chrome/browser/bookmarks/bookmark_model.h" |
16 #include "chrome/browser/dom_ui/history_ui.h" | 17 #include "chrome/browser/dom_ui/history_ui.h" |
17 #include "chrome/browser/external_protocol_handler.h" | 18 #include "chrome/browser/external_protocol_handler.h" |
18 #include "chrome/browser/net/url_fixer_upper.h" | 19 #include "chrome/browser/net/url_fixer_upper.h" |
19 #include "chrome/browser/profile.h" | 20 #include "chrome/browser/profile.h" |
20 #include "chrome/common/gfx/text_elider.h" | 21 #include "chrome/common/gfx/text_elider.h" |
21 #include "chrome/common/l10n_util.h" | |
22 #include "chrome/common/notification_service.h" | 22 #include "chrome/common/notification_service.h" |
23 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
24 #include "chrome/common/pref_service.h" | 24 #include "chrome/common/pref_service.h" |
25 #include "chrome/common/url_constants.h" | 25 #include "chrome/common/url_constants.h" |
26 #include "googleurl/src/gurl.h" | 26 #include "googleurl/src/gurl.h" |
27 #include "googleurl/src/url_canon_ip.h" | 27 #include "googleurl/src/url_canon_ip.h" |
28 #include "grit/generated_resources.h" | 28 #include "grit/generated_resources.h" |
29 #include "net/base/net_util.h" | 29 #include "net/base/net_util.h" |
30 #include "net/base/registry_controlled_domain.h" | 30 #include "net/base/registry_controlled_domain.h" |
31 #include "net/url_request/url_request.h" | 31 #include "net/url_request/url_request.h" |
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
865 match.contents_class.push_back( | 865 match.contents_class.push_back( |
866 ACMatchClassification(keyword_offset + input_.text().size(), | 866 ACMatchClassification(keyword_offset + input_.text().size(), |
867 ACMatchClassification::NONE)); | 867 ACMatchClassification::NONE)); |
868 } | 868 } |
869 match.destination_url = | 869 match.destination_url = |
870 HistoryUI::GetHistoryURLWithSearchText(input_.text()); | 870 HistoryUI::GetHistoryURLWithSearchText(input_.text()); |
871 match.transition = PageTransition::AUTO_BOOKMARK; | 871 match.transition = PageTransition::AUTO_BOOKMARK; |
872 match.provider = history_contents_provider_; | 872 match.provider = history_contents_provider_; |
873 latest_result_.AddMatch(match); | 873 latest_result_.AddMatch(match); |
874 } | 874 } |
OLD | NEW |