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

Unified Diff: chrome/browser/autocomplete/history_contents_provider.cc

Issue 6306011: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autocomplete/history_contents_provider.cc
===================================================================
--- chrome/browser/autocomplete/history_contents_provider.cc (revision 72388)
+++ chrome/browser/autocomplete/history_contents_provider.cc (working copy)
@@ -82,7 +82,7 @@
if ((input.type() == AutocompleteInput::URL) ||
(((input.type() == AutocompleteInput::REQUESTED_URL) ||
(input.type() == AutocompleteInput::UNKNOWN)) &&
- (input.text().find('.') != std::wstring::npos))) {
+ (input.text().find('.') != string16::npos))) {
Stop();
return;
}
@@ -134,7 +134,7 @@
history::QueryOptions options;
options.SetRecentDayRange(kDaysToSearch);
options.max_count = kMaxMatches;
- history->QueryHistory(WideToUTF16(input.text()), options,
+ history->QueryHistory(input.text(), options,
&request_consumer_,
NewCallback(this, &HistoryContentsProvider::QueryComplete));
}
@@ -212,7 +212,7 @@
match.destination_url = result.url();
match.contents_class.push_back(
ACMatchClassification(0, ACMatchClassification::URL));
- match.description = UTF16ToWide(result.title());
+ match.description = result.title();
match.starred =
(profile_->GetBookmarkModel() &&
profile_->GetBookmarkModel()->IsBookmarked(result.url()));
@@ -265,7 +265,7 @@
TimeTicks start_time = TimeTicks::Now();
std::vector<bookmark_utils::TitleMatch> matches;
- bookmark_model->GetBookmarksWithTitlesMatching(WideToUTF16Hack(input.text()),
+ bookmark_model->GetBookmarksWithTitlesMatching(input.text(),
kMaxMatches, &matches);
for (size_t i = 0; i < matches.size(); ++i)
AddBookmarkTitleMatchToResults(matches[i]);

Powered by Google App Engine
This is Rietveld 408576698