| 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();
|
|
|