Wires up bookmark all tabs on linux.

BUG=2935
TEST=Create two tabs, press control-shift-d. You should be presented
with a dialog that lets you give a name to a folder. Change the name,
press enter and make sure you get a bookmark folder populated with the
urls of any open tabs.

Review URL: http://codereview.chromium.org/268038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28788 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 6 deletions

diff --git a/chrome/browser/gtk/bookmark_tree_model.cc b/chrome/browser/gtk/bookmark_tree_model.cc
index 2d59a18..e8e52ca 100644
--- a/chrome/browser/gtk/bookmark_tree_model.cc
+++ b/chrome/browser/gtk/bookmark_tree_model.cc
@@ -98,10 +98,11 @@ GtkTreeStore* MakeFolderTreeStore() {
 }
 
 void AddToTreeStore(BookmarkModel* model, int64 selected_id,
-                    GtkTreeStore* store, GtkTreeIter* selected_iter) {
+                    const BookmarkNode* node_to_ignore, GtkTreeStore* store,
+                    GtkTreeIter* selected_iter) {
   const BookmarkNode* root_node = model->root_node();
   for (int i = 0; i < root_node->GetChildCount(); ++i) {
-    AddToTreeStoreAt(root_node->GetChild(i), selected_id, store,
+    AddToTreeStoreAt(root_node->GetChild(i), selected_id, node_to_ignore, store,
                      selected_iter, NULL);
   }
 }
@@ -137,9 +138,9 @@ GtkCellRenderer* GetCellRendererText(GtkTreeView* tree_view) {
 }
 
 void AddToTreeStoreAt(const BookmarkNode* node, int64 selected_id,
-                      GtkTreeStore* store, GtkTreeIter* selected_iter,
-                      GtkTreeIter* parent) {
-  if (!node->is_folder())
+                      const BookmarkNode* node_to_ignore, GtkTreeStore* store,
+                      GtkTreeIter* selected_iter, GtkTreeIter* parent) {
+  if (!node->is_folder() || node == node_to_ignore)
     return;
 
   GtkTreeIter iter;
@@ -152,7 +153,7 @@ void AddToTreeStoreAt(const BookmarkNode* node, int64 selected_id,
   }
 
   for (int i = 0; i < node->GetChildCount(); ++i) {
-    AddToTreeStoreAt(node->GetChild(i), selected_id, store,
+    AddToTreeStoreAt(node->GetChild(i), selected_id, node_to_ignore, store,
                      selected_iter, &iter);
   }
 }