Support folders in bookmark search

chrome/browser/bookmarks/bookmark_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
@@ skipping 66 matching lines @@
                               const std::vector<string16>& words,
                               const std::string& languages) {
   return
       DoesBookmarkTextContainWords(node->GetTitle(), words) ||
       DoesBookmarkTextContainWords(UTF8ToUTF16(node->url().spec()), words) ||
       DoesBookmarkTextContainWords(net::FormatUrl(
           node->url(), languages, net::kFormatUrlOmitNothing,
           net::UnescapeRule::NORMAL, NULL, NULL, NULL), words);
 }
 
+bool IsTopLevel(const BookmarkNode *n1) {

[tfarina, 2013/12/03 21:19:04]

do not use abbreviations. I suggest you change this to:

const BookmarkNode* node

[sky, 2013/12/03 21:19:07]

Use BookmarkModel::is_permanent_node, also, update the description and test
coverage would be good too.

+  return n1->type() == n1->BOOKMARK_BAR || n1->type() == n1->OTHER_NODE;
+}
+
 }  // namespace
 
 namespace bookmark_utils {
 
 void CloneBookmarkNode(BookmarkModel* model,
                        const std::vector<BookmarkNodeData::Element>& elements,
                        const BookmarkNode* parent,
                        int index_to_add_at,
                        bool reset_node_times) {
   if (!parent->is_folder() || !model) {
@@ skipping 124 matching lines @@
                                 std::vector<const BookmarkNode*>* nodes) {
   std::vector<string16> words;
   QueryParser parser;
   parser.ParseQueryWords(base::i18n::ToLower(text), &words);
   if (words.empty())
     return;
 
   ui::TreeNodeIterator<const BookmarkNode> iterator(model->root_node());
   while (iterator.has_next()) {
     const BookmarkNode* node = iterator.Next();
-    if (DoesBookmarkContainWords(node, words, languages)) {
+    if (DoesBookmarkContainWords(node, words, languages) && !IsTopLevel(node)) {

[tfarina, 2013/12/03 21:19:04]

what if we check is_permanent_node()?

       nodes->push_back(node);
       if (nodes->size() == max_count)
         return;
     }
   }
 }
 
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kShowBookmarkBar,
@@ skipping 69 matching lines @@
   // Remove all the bookmarks.
   for (size_t i = 0; i < bookmarks.size(); ++i) {
     const BookmarkNode* node = bookmarks[i];
     int index = node->parent()->GetIndexOf(node);
     if (index > -1)
       model->Remove(node->parent(), index);
   }
 }
 
 }  // namespace bookmark_utils