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

Unified Diff: chrome/browser/extensions/extension_bookmarks_module.cc

Issue 3117017: Remove deprecated wstring Get(As)String() methods from Value, etc. (Closed)
Patch Set: fix win 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/dom_ui/dom_ui.cc ('k') | chrome/browser/first_run/first_run_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_bookmarks_module.cc
diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc
index b8f9119c29f13714612df04d60eb14eb0ba31e75..12da5f71bbc55a874c8203efb2f82c04e7a398e8 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.cc
+++ b/chrome/browser/extensions/extension_bookmarks_module.cc
@@ -9,6 +9,7 @@
#include "base/stl_util-inl.h"
#include "base/string16.h"
#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_codec.h"
#include "chrome/browser/bookmarks/bookmark_html_writer.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
@@ -321,7 +322,7 @@ bool GetBookmarkTreeFunction::RunImpl() {
}
bool SearchBookmarksFunction::RunImpl() {
- std::wstring query;
+ string16 query;
EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &query));
BookmarkModel* model = profile()->GetBookmarkModel();
@@ -329,7 +330,7 @@ bool SearchBookmarksFunction::RunImpl() {
std::wstring lang =
UTF8ToWide(profile()->GetPrefs()->GetString(prefs::kAcceptLanguages));
std::vector<const BookmarkNode*> nodes;
- bookmark_utils::GetBookmarksContainingText(model, query,
+ bookmark_utils::GetBookmarksContainingText(model, UTF16ToWideHack(query),
std::numeric_limits<int>::max(),
lang, &nodes);
std::vector<const BookmarkNode*>::iterator i = nodes.begin();
« no previous file with comments | « chrome/browser/dom_ui/dom_ui.cc ('k') | chrome/browser/first_run/first_run_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698