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

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: rebase 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"
11 #include "chrome/browser/autocomplete/autocomplete_provider.h" 11 #include "chrome/browser/autocomplete/autocomplete_provider.h"
12 #include "components/metrics/proto/omnibox_event.pb.h"
12 #include "url/gurl.h" 13 #include "url/gurl.h"
13 14
14 // static 15 // static
15 const int AutocompleteClassifier::kDefaultOmniboxProviders = 16 const int AutocompleteClassifier::kDefaultOmniboxProviders =
16 AutocompleteProvider::TYPE_BOOKMARK | 17 AutocompleteProvider::TYPE_BOOKMARK |
17 AutocompleteProvider::TYPE_BUILTIN | 18 AutocompleteProvider::TYPE_BUILTIN |
18 AutocompleteProvider::TYPE_HISTORY_QUICK | 19 AutocompleteProvider::TYPE_HISTORY_QUICK |
19 AutocompleteProvider::TYPE_HISTORY_URL | 20 AutocompleteProvider::TYPE_HISTORY_URL |
20 AutocompleteProvider::TYPE_KEYWORD | 21 AutocompleteProvider::TYPE_KEYWORD |
21 AutocompleteProvider::TYPE_SEARCH | 22 AutocompleteProvider::TYPE_SEARCH |
22 AutocompleteProvider::TYPE_SHORTCUTS | 23 AutocompleteProvider::TYPE_SHORTCUTS |
23 AutocompleteProvider::TYPE_ZERO_SUGGEST; 24 AutocompleteProvider::TYPE_ZERO_SUGGEST;
24 25
25 AutocompleteClassifier::AutocompleteClassifier(Profile* profile) 26 AutocompleteClassifier::AutocompleteClassifier(Profile* profile)
26 : controller_(new AutocompleteController(profile, NULL, 27 : controller_(new AutocompleteController(profile, NULL,
27 kDefaultOmniboxProviders)), 28 kDefaultOmniboxProviders)),
28 inside_classify_(false) { 29 inside_classify_(false) {
29 } 30 }
30 31
31 AutocompleteClassifier::~AutocompleteClassifier() { 32 AutocompleteClassifier::~AutocompleteClassifier() {
32 // We should only reach here after Shutdown() has been called. 33 // We should only reach here after Shutdown() has been called.
33 DCHECK(!controller_.get()); 34 DCHECK(!controller_.get());
34 } 35 }
35 36
36 void AutocompleteClassifier::Classify( 37 void AutocompleteClassifier::Classify(
37 const base::string16& text, 38 const base::string16& text,
38 bool prefer_keyword, 39 bool prefer_keyword,
39 bool allow_exact_keyword_match, 40 bool allow_exact_keyword_match,
40 AutocompleteInput::PageClassification page_classification, 41 metrics::OmniboxEventProto::PageClassification page_classification,
41 AutocompleteMatch* match, 42 AutocompleteMatch* match,
42 GURL* alternate_nav_url) { 43 GURL* alternate_nav_url) {
43 DCHECK(!inside_classify_); 44 DCHECK(!inside_classify_);
44 base::AutoReset<bool> reset(&inside_classify_, true); 45 base::AutoReset<bool> reset(&inside_classify_, true);
45 controller_->Start(AutocompleteInput( 46 controller_->Start(AutocompleteInput(
46 text, base::string16::npos, base::string16(), GURL(), 47 text, base::string16::npos, base::string16(), GURL(),
47 page_classification, true, prefer_keyword, 48 page_classification, true, prefer_keyword,
48 allow_exact_keyword_match, false)); 49 allow_exact_keyword_match, false));
49 DCHECK(controller_->done()); 50 DCHECK(controller_->done());
50 const AutocompleteResult& result = controller_->result(); 51 const AutocompleteResult& result = controller_->result();
51 if (result.empty()) { 52 if (result.empty()) {
52 if (alternate_nav_url) 53 if (alternate_nav_url)
53 *alternate_nav_url = GURL(); 54 *alternate_nav_url = GURL();
54 return; 55 return;
55 } 56 }
56 57
57 DCHECK(result.default_match() != result.end()); 58 DCHECK(result.default_match() != result.end());
58 *match = *result.default_match(); 59 *match = *result.default_match();
59 if (alternate_nav_url) 60 if (alternate_nav_url)
60 *alternate_nav_url = result.alternate_nav_url(); 61 *alternate_nav_url = result.alternate_nav_url();
61 } 62 }
62 63
63 void AutocompleteClassifier::Shutdown() { 64 void AutocompleteClassifier::Shutdown() {
64 controller_.reset(); 65 controller_.reset();
65 } 66 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_classifier.h ('k') | chrome/browser/autocomplete/autocomplete_input.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698