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/ui/webui/omnibox/omnibox_ui_handler.h" | 5 #include "chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/strings/string16.h" | 11 #include "base/strings/string16.h" |
12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "base/time/time.h" | 14 #include "base/time/time.h" |
15 #include "base/values.h" | 15 #include "base/values.h" |
16 #include "chrome/browser/autocomplete/autocomplete_classifier.h" | 16 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
17 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 17 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
18 #include "chrome/browser/autocomplete/autocomplete_match.h" | 18 #include "chrome/browser/autocomplete/autocomplete_match.h" |
19 #include "chrome/browser/autocomplete/autocomplete_provider.h" | 19 #include "chrome/browser/autocomplete/autocomplete_provider.h" |
20 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" | 20 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" |
21 #include "chrome/browser/history/history_service.h" | 21 #include "chrome/browser/history/history_service.h" |
22 #include "chrome/browser/history/history_service_factory.h" | 22 #include "chrome/browser/history/history_service_factory.h" |
23 #include "chrome/browser/search/search.h" | 23 #include "chrome/browser/search/search.h" |
| 24 #include "chrome/browser/search_engines/template_url_service_factory.h" |
24 #include "components/history/core/browser/url_database.h" | 25 #include "components/history/core/browser/url_database.h" |
25 #include "components/metrics/proto/omnibox_event.pb.h" | 26 #include "components/metrics/proto/omnibox_event.pb.h" |
26 #include "components/search_engines/template_url.h" | 27 #include "components/search_engines/template_url.h" |
27 #include "content/public/browser/web_ui.h" | 28 #include "content/public/browser/web_ui.h" |
28 #include "mojo/common/common_type_converters.h" | 29 #include "mojo/common/common_type_converters.h" |
29 | 30 |
30 namespace mojo { | 31 namespace mojo { |
31 | 32 |
32 template <> | 33 template <> |
33 class TypeConverter<mojo::Array<AutocompleteAdditionalInfoPtr>, | 34 class TypeConverter<mojo::Array<AutocompleteAdditionalInfoPtr>, |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 input_string.To<base::string16>(), cursor_position, base::string16(), | 174 input_string.To<base::string16>(), cursor_position, base::string16(), |
174 GURL(), | 175 GURL(), |
175 static_cast<metrics::OmniboxEventProto::PageClassification>( | 176 static_cast<metrics::OmniboxEventProto::PageClassification>( |
176 page_classification), | 177 page_classification), |
177 prevent_inline_autocomplete, prefer_keyword, true, true, | 178 prevent_inline_autocomplete, prefer_keyword, true, true, |
178 ChromeAutocompleteSchemeClassifier(profile_)); | 179 ChromeAutocompleteSchemeClassifier(profile_)); |
179 controller_->Start(input_); | 180 controller_->Start(input_); |
180 } | 181 } |
181 | 182 |
182 void OmniboxUIHandler::ResetController() { | 183 void OmniboxUIHandler::ResetController() { |
183 controller_.reset(new AutocompleteController(profile_, this, | 184 controller_.reset(new AutocompleteController(profile_, |
| 185 TemplateURLServiceFactory::GetForProfile(profile_), |
| 186 this, |
184 AutocompleteClassifier::kDefaultOmniboxProviders)); | 187 AutocompleteClassifier::kDefaultOmniboxProviders)); |
185 } | 188 } |
OLD | NEW |