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

Unified Diff: chrome/browser/bookmarks/bookmark_utils.cc

Issue 3197009: Remove wstrings in bookmarks, part 10. (Closed)
Patch Set: Created 10 years, 4 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
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils.h ('k') | chrome/browser/bookmarks/bookmark_utils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_utils.cc
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index af8d6acc50180115282864a1dc8875bb44ee9eaf..1a69d636732630a7ca06c1b8ea8a1377759e8326 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -501,13 +501,13 @@ bool MoreRecentlyAdded(const BookmarkNode* n1, const BookmarkNode* n2) {
}
void GetBookmarksContainingText(BookmarkModel* model,
- const std::wstring& text,
+ const string16& text,
size_t max_count,
const std::wstring& languages,
std::vector<const BookmarkNode*>* nodes) {
std::vector<string16> words;
QueryParser parser;
- parser.ExtractQueryWords(l10n_util::ToLower(WideToUTF16(text)), &words);
+ parser.ExtractQueryWords(l10n_util::ToLower(text), &words);
if (words.empty())
return;
@@ -523,11 +523,11 @@ void GetBookmarksContainingText(BookmarkModel* model,
}
bool DoesBookmarkContainText(const BookmarkNode* node,
- const std::wstring& text,
+ const string16& text,
const std::wstring& languages) {
std::vector<string16> words;
QueryParser parser;
- parser.ExtractQueryWords(l10n_util::ToLower(WideToUTF16(text)), &words);
+ parser.ExtractQueryWords(l10n_util::ToLower(text), &words);
if (words.empty())
return false;
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils.h ('k') | chrome/browser/bookmarks/bookmark_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698