Makes canceling 'bookmark all tabs' delete the folder. Or rather,...

chrome/browser/gtk/bookmark_tree_model.cc

Index: chrome/browser/gtk/bookmark_tree_model.cc
===================================================================
--- chrome/browser/gtk/bookmark_tree_model.cc	(revision 29276)
+++ chrome/browser/gtk/bookmark_tree_model.cc	(working copy)
@@ -98,12 +98,11 @@
 }
 
 void AddToTreeStore(BookmarkModel* model, int64 selected_id,
-                    const BookmarkNode* node_to_ignore, GtkTreeStore* store,
-                    GtkTreeIter* selected_iter) {
+                    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, node_to_ignore, store,
-                     selected_iter, NULL);
+    AddToTreeStoreAt(root_node->GetChild(i), selected_id, store, selected_iter,
+                     NULL);
   }
 }
 
@@ -138,9 +137,9 @@
 }
 
 void AddToTreeStoreAt(const BookmarkNode* node, int64 selected_id,
-                      const BookmarkNode* node_to_ignore, GtkTreeStore* store,
-                      GtkTreeIter* selected_iter, GtkTreeIter* parent) {
-  if (!node->is_folder() || node == node_to_ignore)
+                      GtkTreeStore* store, GtkTreeIter* selected_iter,
+                      GtkTreeIter* parent) {
+  if (!node->is_folder())
     return;
 
   GtkTreeIter iter;
@@ -153,8 +152,8 @@
   }
 
   for (int i = 0; i < node->GetChildCount(); ++i) {
-    AddToTreeStoreAt(node->GetChild(i), selected_id, node_to_ignore, store,
-                     selected_iter, &iter);
+    AddToTreeStoreAt(node->GetChild(i), selected_id, store, selected_iter,
+                     &iter);
   }
 }