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

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

Issue 343523003: Remove AutocompleteInput Type and PageClassification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 6 months 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 19 matching lines...) Expand all
30 30
31 AutocompleteClassifier::~AutocompleteClassifier() { 31 AutocompleteClassifier::~AutocompleteClassifier() {
32 // We should only reach here after Shutdown() has been called. 32 // We should only reach here after Shutdown() has been called.
33 DCHECK(!controller_.get()); 33 DCHECK(!controller_.get());
34 } 34 }
35 35
36 void AutocompleteClassifier::Classify( 36 void AutocompleteClassifier::Classify(
37 const base::string16& text, 37 const base::string16& text,
38 bool prefer_keyword, 38 bool prefer_keyword,
39 bool allow_exact_keyword_match, 39 bool allow_exact_keyword_match,
40 AutocompleteInput::PageClassification page_classification, 40 metrics::OmniboxEventProto::PageClassification page_classification,
41 AutocompleteMatch* match, 41 AutocompleteMatch* match,
42 GURL* alternate_nav_url) { 42 GURL* alternate_nav_url) {
43 DCHECK(!inside_classify_); 43 DCHECK(!inside_classify_);
44 base::AutoReset<bool> reset(&inside_classify_, true); 44 base::AutoReset<bool> reset(&inside_classify_, true);
45 controller_->Start(AutocompleteInput( 45 controller_->Start(AutocompleteInput(
46 text, base::string16::npos, base::string16(), GURL(), 46 text, base::string16::npos, base::string16(), GURL(),
47 page_classification, true, prefer_keyword, 47 page_classification, true, prefer_keyword,
48 allow_exact_keyword_match, false)); 48 allow_exact_keyword_match, false));
49 DCHECK(controller_->done()); 49 DCHECK(controller_->done());
50 const AutocompleteResult& result = controller_->result(); 50 const AutocompleteResult& result = controller_->result();
51 if (result.empty()) { 51 if (result.empty()) {
52 if (alternate_nav_url) 52 if (alternate_nav_url)
53 *alternate_nav_url = GURL(); 53 *alternate_nav_url = GURL();
54 return; 54 return;
55 } 55 }
56 56
57 DCHECK(result.default_match() != result.end()); 57 DCHECK(result.default_match() != result.end());
58 *match = *result.default_match(); 58 *match = *result.default_match();
59 if (alternate_nav_url) 59 if (alternate_nav_url)
60 *alternate_nav_url = result.alternate_nav_url(); 60 *alternate_nav_url = result.alternate_nav_url();
61 } 61 }
62 62
63 void AutocompleteClassifier::Shutdown() { 63 void AutocompleteClassifier::Shutdown() {
64 controller_.reset(); 64 controller_.reset();
65 } 65 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698