Chromium Code Reviews| 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 "googleurl/src/gurl.h" | 12 #include "googleurl/src/gurl.h" |
| 12 | 13 |
| 14 // static | |
| 15 const int AutocompleteClassifier::kDefaultOmniboxProviders = | |
| 16 AutocompleteProvider::TYPE_BUILTIN | | |
| 17 AutocompleteProvider::TYPE_EXTENSION_APP | | |
| 18 AutocompleteProvider::TYPE_HISTORY_CONTENTS | | |
| 19 AutocompleteProvider::TYPE_HISTORY_QUICK | | |
| 20 AutocompleteProvider::TYPE_HISTORY_URL | | |
| 21 AutocompleteProvider::TYPE_KEYWORD | | |
| 22 AutocompleteProvider::TYPE_SEARCH | | |
| 23 AutocompleteProvider::TYPE_SHORTCUTS | | |
| 24 AutocompleteProvider::TYPE_ZERO_SUGGEST; | |
| 25 | |
| 13 AutocompleteClassifier::AutocompleteClassifier(Profile* profile) | 26 AutocompleteClassifier::AutocompleteClassifier(Profile* profile) |
| 14 : controller_(new AutocompleteController(profile, NULL)), | 27 : controller_(new AutocompleteController(profile, |
|
Peter Kasting
2012/09/07 23:23:02
Nit: I would probably just wrap after NULL and ind
Daniel Erat
2012/09/08 16:37:36
Done.
| |
| 28 NULL, | |
| 29 kDefaultOmniboxProviders)), | |
| 15 inside_classify_(false) { | 30 inside_classify_(false) { |
| 16 } | 31 } |
| 17 | 32 |
| 18 AutocompleteClassifier::~AutocompleteClassifier() { | 33 AutocompleteClassifier::~AutocompleteClassifier() { |
| 19 // We should only reach here after Shutdown() has been called. | 34 // We should only reach here after Shutdown() has been called. |
| 20 DCHECK(!controller_.get()); | 35 DCHECK(!controller_.get()); |
| 21 } | 36 } |
| 22 | 37 |
| 23 void AutocompleteClassifier::Classify(const string16& text, | 38 void AutocompleteClassifier::Classify(const string16& text, |
| 24 const string16& desired_tld, | 39 const string16& desired_tld, |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 40 | 55 |
| 41 DCHECK(result.default_match() != result.end()); | 56 DCHECK(result.default_match() != result.end()); |
| 42 *match = *result.default_match(); | 57 *match = *result.default_match(); |
| 43 if (alternate_nav_url) | 58 if (alternate_nav_url) |
| 44 *alternate_nav_url = result.alternate_nav_url(); | 59 *alternate_nav_url = result.alternate_nav_url(); |
| 45 } | 60 } |
| 46 | 61 |
| 47 void AutocompleteClassifier::Shutdown() { | 62 void AutocompleteClassifier::Shutdown() { |
| 48 controller_.reset(); | 63 controller_.reset(); |
| 49 } | 64 } |
| OLD | NEW |