Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Side by Side Diff: chrome/browser/autocomplete/autocomplete_classifier.cc

Issue 11414303: Make Google Search autocomplete provider cursor aware. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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(
56 allow_exact_keyword_match, AutocompleteInput::BEST_MATCH); 56 text, string16::npos, desired_tld, true, prefer_keyword,
57 allow_exact_keyword_match, AutocompleteInput::BEST_MATCH));
57 DCHECK(controller_->done()); 58 DCHECK(controller_->done());
58 const AutocompleteResult& result = controller_->result(); 59 const AutocompleteResult& result = controller_->result();
59 if (result.empty()) { 60 if (result.empty()) {
60 if (alternate_nav_url) 61 if (alternate_nav_url)
61 *alternate_nav_url = GURL(); 62 *alternate_nav_url = GURL();
62 return; 63 return;
63 } 64 }
64 65
65 DCHECK(result.default_match() != result.end()); 66 DCHECK(result.default_match() != result.end());
66 *match = *result.default_match(); 67 *match = *result.default_match();
67 if (alternate_nav_url) 68 if (alternate_nav_url)
68 *alternate_nav_url = result.alternate_nav_url(); 69 *alternate_nav_url = result.alternate_nav_url();
69 } 70 }
70 71
71 void AutocompleteClassifier::Shutdown() { 72 void AutocompleteClassifier::Shutdown() {
72 controller_.reset(); 73 controller_.reset();
73 } 74 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698