diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 22:12:06 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 22:12:06 +0000 |
commit | fa5dfaff1d203ab3fb692b6cd2bf0bdb67b1059c (patch) | |
tree | 0e5df732f7adb333862e5d44ef549dbb039498e6 /chrome/browser/extensions | |
parent | 8d3b9474b8b002be9e0568aaa7aca64545de960a (diff) | |
download | chromium_src-fa5dfaff1d203ab3fb692b6cd2bf0bdb67b1059c.zip chromium_src-fa5dfaff1d203ab3fb692b6cd2bf0bdb67b1059c.tar.gz chromium_src-fa5dfaff1d203ab3fb692b6cd2bf0bdb67b1059c.tar.bz2 |
Support for searching bookmarks for IDN.
The main part of this change is DoesBookmarkContainWords() in
bookmark_utils.cc. It tries to match a query words to IDN and
%-decoded strings as well as ASCII URL.
BUG=3991
TEST=add a unit test, check for IDN in the search box of Bookmark
Manager.
Checked in for tkent@google.com.
Original review: http://codereview.chromium.org/113815
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r-- | chrome/browser/extensions/extension_bookmarks_module.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc index 8225f7a..bced32f 100644 --- a/chrome/browser/extensions/extension_bookmarks_module.cc +++ b/chrome/browser/extensions/extension_bookmarks_module.cc @@ -12,6 +12,8 @@ #include "chrome/browser/extensions/extension_bookmarks_module_constants.h" #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/profile.h" +#include "chrome/common/pref_names.h" +#include "chrome/common/pref_service.h" namespace keys = extension_bookmarks_module_constants; @@ -284,8 +286,9 @@ bool SearchBookmarksFunction::RunImpl() { BookmarkModel* model = profile()->GetBookmarkModel(); ListValue* json = new ListValue(); + std::wstring lang = profile()->GetPrefs()->GetString(prefs::kAcceptLanguages); std::vector<BookmarkNode*> nodes; - bookmark_utils::GetBookmarksContainingText(model, query, 50, &nodes); + bookmark_utils::GetBookmarksContainingText(model, query, 50, lang, &nodes); std::vector<BookmarkNode*>::iterator i = nodes.begin(); for (; i != nodes.end(); ++i) { BookmarkNode* node = *i; |