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/autocomplete/autocomplete_classifier.h" | 5 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 8 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
9 #include "chrome/browser/autocomplete/autocomplete_input.h" | 9 #include "chrome/browser/autocomplete/autocomplete_input.h" |
10 #include "chrome/browser/autocomplete/autocomplete_match.h" | 10 #include "chrome/browser/autocomplete/autocomplete_match.h" |
11 #include "chrome/browser/autocomplete/autocomplete_provider.h" | 11 #include "chrome/browser/autocomplete/autocomplete_provider.h" |
12 #include "googleurl/src/gurl.h" | 12 #include "googleurl/src/gurl.h" |
13 | 13 |
14 // static | 14 // static |
15 const int AutocompleteClassifier::kDefaultOmniboxProviders = | 15 const int AutocompleteClassifier::kDefaultOmniboxProviders = |
16 AutocompleteProvider::TYPE_BUILTIN | | 16 AutocompleteProvider::TYPE_BUILTIN | |
17 AutocompleteProvider::TYPE_EXTENSION_APP | | 17 AutocompleteProvider::TYPE_EXTENSION_APP | |
18 AutocompleteProvider::TYPE_HISTORY_CONTENTS | | 18 AutocompleteProvider::TYPE_HISTORY_CONTENTS | |
19 AutocompleteProvider::TYPE_HISTORY_QUICK | | 19 AutocompleteProvider::TYPE_HISTORY_QUICK | |
20 AutocompleteProvider::TYPE_HISTORY_URL | | 20 AutocompleteProvider::TYPE_HISTORY_URL | |
21 AutocompleteProvider::TYPE_KEYWORD | | 21 AutocompleteProvider::TYPE_KEYWORD | |
22 AutocompleteProvider::TYPE_SEARCH | | 22 AutocompleteProvider::TYPE_SEARCH | |
23 AutocompleteProvider::TYPE_SHORTCUTS | | 23 AutocompleteProvider::TYPE_SHORTCUTS | |
24 AutocompleteProvider::TYPE_ZERO_SUGGEST; | 24 AutocompleteProvider::TYPE_ZERO_SUGGEST| |
| 25 AutocompleteProvider::TYPE_BOOKMARK; |
25 | 26 |
26 AutocompleteClassifier::AutocompleteClassifier(Profile* profile) | 27 AutocompleteClassifier::AutocompleteClassifier(Profile* profile) |
27 : controller_(new AutocompleteController(profile, NULL, | 28 : controller_(new AutocompleteController(profile, NULL, |
28 kDefaultOmniboxProviders)), | 29 kDefaultOmniboxProviders)), |
29 inside_classify_(false) { | 30 inside_classify_(false) { |
30 } | 31 } |
31 | 32 |
32 AutocompleteClassifier::~AutocompleteClassifier() { | 33 AutocompleteClassifier::~AutocompleteClassifier() { |
33 // We should only reach here after Shutdown() has been called. | 34 // We should only reach here after Shutdown() has been called. |
34 DCHECK(!controller_.get()); | 35 DCHECK(!controller_.get()); |
(...skipping 19 matching lines...) Expand all Loading... |
54 | 55 |
55 DCHECK(result.default_match() != result.end()); | 56 DCHECK(result.default_match() != result.end()); |
56 *match = *result.default_match(); | 57 *match = *result.default_match(); |
57 if (alternate_nav_url) | 58 if (alternate_nav_url) |
58 *alternate_nav_url = result.alternate_nav_url(); | 59 *alternate_nav_url = result.alternate_nav_url(); |
59 } | 60 } |
60 | 61 |
61 void AutocompleteClassifier::Shutdown() { | 62 void AutocompleteClassifier::Shutdown() { |
62 controller_.reset(); | 63 controller_.reset(); |
63 } | 64 } |
OLD | NEW |