diff options
| author | d.halman@gmail.com <d.halman@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 03:49:42 +0000 |
|---|---|---|
| committer | d.halman@gmail.com <d.halman@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 03:49:42 +0000 |
| commit | 5b33ab7789d9eadf8403243866b4550d99b70d22 (patch) | |
| tree | 8c456bf1ae9669e884bddd03dea107a3f1f54fc8 /chrome/browser/bookmarks | |
| parent | f72879c625e0a38dbc6ae458a7dcc0228eba004a (diff) | |
| download | chromium_src-5b33ab7789d9eadf8403243866b4550d99b70d22.zip chromium_src-5b33ab7789d9eadf8403243866b4550d99b70d22.tar.gz chromium_src-5b33ab7789d9eadf8403243866b4550d99b70d22.tar.bz2 | |
Include folders in bookmarks search.
Folders are now returned in bookmark searches, and double clicking a folder from
the results will allow the user to navigate the folder's contents.
BUG=17306
TEST=unit_tests --gtest_filter=BookmarkUtilsTest.GetBookmarksContainingText
R=mpcomplete,sky,tfarina
Review URL: https://codereview.chromium.org/75963003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_utils.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_utils_unittest.cc | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index e54f528..4820b69 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -228,7 +228,7 @@ void GetBookmarksContainingText(BookmarkModel* model, ui::TreeNodeIterator<const BookmarkNode> iterator(model->root_node()); while (iterator.has_next()) { const BookmarkNode* node = iterator.Next(); - if (node->is_url() && DoesBookmarkContainWords(node, words, languages)) { + if (DoesBookmarkContainWords(node, words, languages)) { nodes->push_back(node); if (nodes->size() == max_count) return; diff --git a/chrome/browser/bookmarks/bookmark_utils_unittest.cc b/chrome/browser/bookmarks/bookmark_utils_unittest.cc index 9e5396b..b7977eb 100644 --- a/chrome/browser/bookmarks/bookmark_utils_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_utils_unittest.cc @@ -29,34 +29,37 @@ class BookmarkUtilsTest : public ::testing::Test { TEST_F(BookmarkUtilsTest, GetBookmarksContainingText) { BookmarkModel model(NULL); - const BookmarkNode* n1 = model.AddURL(model.other_node(), + const BookmarkNode* node1 = model.AddURL(model.other_node(), 0, ASCIIToUTF16("foo bar"), GURL("http://www.google.com")); - const BookmarkNode* n2 = model.AddURL(model.other_node(), + const BookmarkNode* node2 = model.AddURL(model.other_node(), 0, ASCIIToUTF16("baz buz"), GURL("http://www.cnn.com")); - model.AddFolder(model.other_node(), 0, ASCIIToUTF16("foo")); + const BookmarkNode* folder1 = model.AddFolder(model.other_node(), + 0, + ASCIIToUTF16("foo")); std::vector<const BookmarkNode*> nodes; GetBookmarksContainingText( &model, ASCIIToUTF16("foo"), 100, string(), &nodes); - ASSERT_EQ(1U, nodes.size()); - EXPECT_TRUE(nodes[0] == n1); + ASSERT_EQ(2U, nodes.size()); + EXPECT_TRUE(nodes[0] == folder1); + EXPECT_TRUE(nodes[1] == node1); nodes.clear(); GetBookmarksContainingText( &model, ASCIIToUTF16("cnn"), 100, string(), &nodes); ASSERT_EQ(1U, nodes.size()); - EXPECT_TRUE(nodes[0] == n2); + EXPECT_TRUE(nodes[0] == node2); nodes.clear(); GetBookmarksContainingText( &model, ASCIIToUTF16("foo bar"), 100, string(), &nodes); ASSERT_EQ(1U, nodes.size()); - EXPECT_TRUE(nodes[0] == n1); + EXPECT_TRUE(nodes[0] == node1); nodes.clear(); } |