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

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

Issue 6258015: Remove wstring from autocomplete.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/autocomplete/autocomplete.h" 7 #include "chrome/browser/autocomplete/autocomplete.h"
8 #include "chrome/browser/autocomplete/autocomplete_match.h" 8 #include "chrome/browser/autocomplete/autocomplete_match.h"
9 #include "googleurl/src/gurl.h" 9 #include "googleurl/src/gurl.h"
10 10
11 AutocompleteClassifier::AutocompleteClassifier(Profile* profile) 11 AutocompleteClassifier::AutocompleteClassifier(Profile* profile)
12 : controller_(new AutocompleteController(profile)) { 12 : controller_(new AutocompleteController(profile)) {
13 } 13 }
14 14
15 AutocompleteClassifier::~AutocompleteClassifier() { 15 AutocompleteClassifier::~AutocompleteClassifier() {
16 } 16 }
17 17
18 void AutocompleteClassifier::Classify(const std::wstring& text, 18 void AutocompleteClassifier::Classify(const string16& text,
19 const std::wstring& desired_tld, 19 const string16& desired_tld,
20 bool allow_exact_keyword_match, 20 bool allow_exact_keyword_match,
21 AutocompleteMatch* match, 21 AutocompleteMatch* match,
22 GURL* alternate_nav_url) { 22 GURL* alternate_nav_url) {
23 controller_->Start(text, desired_tld, true, false, allow_exact_keyword_match, 23 controller_->Start(text, desired_tld, true, false, allow_exact_keyword_match,
24 true); 24 true);
25 DCHECK(controller_->done()); 25 DCHECK(controller_->done());
26 const AutocompleteResult& result = controller_->result(); 26 const AutocompleteResult& result = controller_->result();
27 if (result.empty()) { 27 if (result.empty()) {
28 if (alternate_nav_url) 28 if (alternate_nav_url)
29 *alternate_nav_url = GURL(); 29 *alternate_nav_url = GURL();
30 return; 30 return;
31 } 31 }
32 32
33 DCHECK(result.default_match() != result.end()); 33 DCHECK(result.default_match() != result.end());
34 *match = *result.default_match(); 34 *match = *result.default_match();
35 if (alternate_nav_url) 35 if (alternate_nav_url)
36 *alternate_nav_url = result.alternate_nav_url(); 36 *alternate_nav_url = result.alternate_nav_url();
37 } 37 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698