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" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 45 } | 45 } |
| 46 | 46 |
| 47 void AutocompleteClassifier::Classify(const string16& text, | 47 void AutocompleteClassifier::Classify(const string16& text, |
| 48 const string16& desired_tld, | 48 const string16& desired_tld, |
| 49 bool prefer_keyword, | 49 bool prefer_keyword, |
| 50 bool allow_exact_keyword_match, | 50 bool allow_exact_keyword_match, |
| 51 AutocompleteMatch* match, | 51 AutocompleteMatch* match, |
| 52 GURL* alternate_nav_url) { | 52 GURL* alternate_nav_url) { |
| 53 DCHECK(!inside_classify_); | 53 DCHECK(!inside_classify_); |
| 54 base::AutoReset<bool> reset(&inside_classify_, true); | 54 base::AutoReset<bool> reset(&inside_classify_, true); |
| 55 controller_->Start(text, desired_tld, true, prefer_keyword, | 55 controller_->Start(AutocompleteInput(text, string16::npos, desired_tld, true, |
|
Peter Kasting
2012/12/05 20:49:38
Nit: For example, here I'd probably break after "A
Bart N.
2012/12/06 21:43:32
Yup. Done in all places.
BTW, you realize that th
| |
| 56 allow_exact_keyword_match, AutocompleteInput::BEST_MATCH); | 56 prefer_keyword, |
| 57 allow_exact_keyword_match, | |
| 58 AutocompleteInput::BEST_MATCH)); | |
| 57 DCHECK(controller_->done()); | 59 DCHECK(controller_->done()); |
| 58 const AutocompleteResult& result = controller_->result(); | 60 const AutocompleteResult& result = controller_->result(); |
| 59 if (result.empty()) { | 61 if (result.empty()) { |
| 60 if (alternate_nav_url) | 62 if (alternate_nav_url) |
| 61 *alternate_nav_url = GURL(); | 63 *alternate_nav_url = GURL(); |
| 62 return; | 64 return; |
| 63 } | 65 } |
| 64 | 66 |
| 65 DCHECK(result.default_match() != result.end()); | 67 DCHECK(result.default_match() != result.end()); |
| 66 *match = *result.default_match(); | 68 *match = *result.default_match(); |
| 67 if (alternate_nav_url) | 69 if (alternate_nav_url) |
| 68 *alternate_nav_url = result.alternate_nav_url(); | 70 *alternate_nav_url = result.alternate_nav_url(); |
| 69 } | 71 } |
| 70 | 72 |
| 71 void AutocompleteClassifier::Shutdown() { | 73 void AutocompleteClassifier::Shutdown() { |
| 72 controller_.reset(); | 74 controller_.reset(); |
| 73 } | 75 } |
| OLD | NEW |