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 "components/omnibox/browser/autocomplete_classifier.h" | 5 #include "components/omnibox/browser/autocomplete_classifier.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
8 #include "build/build_config.h" | 10 #include "build/build_config.h" |
9 #include "components/metrics/proto/omnibox_event.pb.h" | 11 #include "components/metrics/proto/omnibox_event.pb.h" |
10 #include "components/omnibox/browser/autocomplete_controller.h" | 12 #include "components/omnibox/browser/autocomplete_controller.h" |
11 #include "components/omnibox/browser/autocomplete_input.h" | 13 #include "components/omnibox/browser/autocomplete_input.h" |
12 #include "components/omnibox/browser/autocomplete_match.h" | 14 #include "components/omnibox/browser/autocomplete_match.h" |
13 #include "components/omnibox/browser/autocomplete_provider.h" | 15 #include "components/omnibox/browser/autocomplete_provider.h" |
14 #include "url/gurl.h" | 16 #include "url/gurl.h" |
15 | 17 |
16 // static | 18 // static |
(...skipping 12 matching lines...) Expand all Loading... |
29 AutocompleteProvider::TYPE_CLIPBOARD_URL | | 31 AutocompleteProvider::TYPE_CLIPBOARD_URL | |
30 #endif | 32 #endif |
31 AutocompleteProvider::TYPE_BOOKMARK | | 33 AutocompleteProvider::TYPE_BOOKMARK | |
32 AutocompleteProvider::TYPE_HISTORY_QUICK | | 34 AutocompleteProvider::TYPE_HISTORY_QUICK | |
33 AutocompleteProvider::TYPE_HISTORY_URL | | 35 AutocompleteProvider::TYPE_HISTORY_URL | |
34 AutocompleteProvider::TYPE_SEARCH; | 36 AutocompleteProvider::TYPE_SEARCH; |
35 | 37 |
36 AutocompleteClassifier::AutocompleteClassifier( | 38 AutocompleteClassifier::AutocompleteClassifier( |
37 scoped_ptr<AutocompleteController> controller, | 39 scoped_ptr<AutocompleteController> controller, |
38 scoped_ptr<AutocompleteSchemeClassifier> scheme_classifier) | 40 scoped_ptr<AutocompleteSchemeClassifier> scheme_classifier) |
39 : controller_(controller.Pass()), | 41 : controller_(std::move(controller)), |
40 scheme_classifier_(scheme_classifier.Pass()), | 42 scheme_classifier_(std::move(scheme_classifier)), |
41 inside_classify_(false) { | 43 inside_classify_(false) {} |
42 } | |
43 | 44 |
44 AutocompleteClassifier::~AutocompleteClassifier() { | 45 AutocompleteClassifier::~AutocompleteClassifier() { |
45 // We should only reach here after Shutdown() has been called. | 46 // We should only reach here after Shutdown() has been called. |
46 DCHECK(!controller_.get()); | 47 DCHECK(!controller_.get()); |
47 } | 48 } |
48 | 49 |
49 void AutocompleteClassifier::Classify( | 50 void AutocompleteClassifier::Classify( |
50 const base::string16& text, | 51 const base::string16& text, |
51 bool prefer_keyword, | 52 bool prefer_keyword, |
52 bool allow_exact_keyword_match, | 53 bool allow_exact_keyword_match, |
(...skipping 16 matching lines...) Expand all Loading... |
69 | 70 |
70 DCHECK(result.default_match() != result.end()); | 71 DCHECK(result.default_match() != result.end()); |
71 *match = *result.default_match(); | 72 *match = *result.default_match(); |
72 if (alternate_nav_url) | 73 if (alternate_nav_url) |
73 *alternate_nav_url = result.alternate_nav_url(); | 74 *alternate_nav_url = result.alternate_nav_url(); |
74 } | 75 } |
75 | 76 |
76 void AutocompleteClassifier::Shutdown() { | 77 void AutocompleteClassifier::Shutdown() { |
77 controller_.reset(); | 78 controller_.reset(); |
78 } | 79 } |
OLD | NEW |