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 <stddef.h> | 7 #include <stddef.h> |
| 8 |
8 #include <string> | 9 #include <string> |
9 #include <utility> | 10 #include <utility> |
10 | 11 |
11 #include "base/auto_reset.h" | 12 #include "base/auto_reset.h" |
12 #include "base/bind.h" | 13 #include "base/bind.h" |
| 14 #include "base/memory/ptr_util.h" |
13 #include "base/strings/string16.h" | 15 #include "base/strings/string16.h" |
14 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
15 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
16 #include "base/time/time.h" | 18 #include "base/time/time.h" |
17 #include "base/values.h" | 19 #include "base/values.h" |
18 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" | 20 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" |
19 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" | 21 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" |
20 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 22 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
21 #include "chrome/browser/history/history_service_factory.h" | 23 #include "chrome/browser/history/history_service_factory.h" |
22 #include "chrome/browser/search/search.h" | 24 #include "chrome/browser/search/search.h" |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
201 input_string.To<base::string16>(), cursor_position, std::string(), GURL(), | 203 input_string.To<base::string16>(), cursor_position, std::string(), GURL(), |
202 static_cast<metrics::OmniboxEventProto::PageClassification>( | 204 static_cast<metrics::OmniboxEventProto::PageClassification>( |
203 page_classification), | 205 page_classification), |
204 prevent_inline_autocomplete, prefer_keyword, true, true, false, | 206 prevent_inline_autocomplete, prefer_keyword, true, true, false, |
205 ChromeAutocompleteSchemeClassifier(profile_)); | 207 ChromeAutocompleteSchemeClassifier(profile_)); |
206 controller_->Start(input_); | 208 controller_->Start(input_); |
207 } | 209 } |
208 | 210 |
209 void OmniboxUIHandler::ResetController() { | 211 void OmniboxUIHandler::ResetController() { |
210 controller_.reset(new AutocompleteController( | 212 controller_.reset(new AutocompleteController( |
211 make_scoped_ptr(new ChromeAutocompleteProviderClient(profile_)), this, | 213 base::WrapUnique(new ChromeAutocompleteProviderClient(profile_)), this, |
212 AutocompleteClassifier::kDefaultOmniboxProviders)); | 214 AutocompleteClassifier::kDefaultOmniboxProviders)); |
213 } | 215 } |
OLD | NEW |