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

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

Issue 113815: Support for searching bookmarks for IDN.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 7 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/bookmarks/bookmark_table_model.cc
===================================================================
--- chrome/browser/bookmarks/bookmark_table_model.cc (revision 17304)
+++ chrome/browser/bookmarks/bookmark_table_model.cc (working copy)
@@ -225,18 +225,22 @@
class BookmarkSearchTableModel : public VectorBackedBookmarkTableModel {
public:
BookmarkSearchTableModel(BookmarkModel* model,
- const std::wstring& search_text)
+ const std::wstring& search_text,
+ const std::wstring& languages)
: VectorBackedBookmarkTableModel(model),
- search_text_(search_text) {
+ search_text_(search_text),
+ languages_(languages) {
bookmark_utils::GetBookmarksContainingText(
- model, search_text, std::numeric_limits<int>::max(), &nodes());
+ model, search_text, std::numeric_limits<int>::max(),
+ languages, &nodes());
}
virtual void BookmarkNodeAdded(BookmarkModel* model,
BookmarkNode* parent,
int index) {
BookmarkNode* node = parent->GetChild(index);
- if (bookmark_utils::DoesBookmarkContainText(node, search_text_)) {
+ if (bookmark_utils::DoesBookmarkContainText(
+ node, search_text_, languages_)) {
nodes().push_back(node);
if (observer())
observer()->OnItemsAdded(static_cast<int>(nodes().size() - 1), 1);
@@ -258,6 +262,7 @@
private:
const std::wstring search_text_;
+ const std::wstring languages_;
DISALLOW_COPY_AND_ASSIGN(BookmarkSearchTableModel);
};
@@ -281,8 +286,9 @@
// static
BookmarkTableModel* BookmarkTableModel::CreateSearchTableModel(
BookmarkModel* model,
- const std::wstring& text) {
- return new BookmarkSearchTableModel(model, text);
+ const std::wstring& text,
+ const std::wstring& languages) {
+ return new BookmarkSearchTableModel(model, text, languages);
}
BookmarkTableModel::BookmarkTableModel(BookmarkModel* model)
« no previous file with comments | « chrome/browser/bookmarks/bookmark_table_model.h ('k') | chrome/browser/bookmarks/bookmark_table_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698