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

chrome/browser/gtk/bookmark_tree_model.cc

 // Copyright (c) 2009 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/gtk/bookmark_tree_model.h"
 
 #include <gtk/gtk.h>
 
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
@@ skipping 80 matching lines @@
 }  // namespace
 
 namespace bookmark_utils {
 
 GtkTreeStore* MakeFolderTreeStore() {
   return gtk_tree_store_new(FOLDER_STORE_NUM_COLUMNS, GDK_TYPE_PIXBUF,
                             G_TYPE_STRING, G_TYPE_INT64, G_TYPE_BOOLEAN);
 }
 
 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);
   }
 }
 
 GtkWidget* MakeTreeViewForStore(GtkTreeStore* store) {
   GtkTreeViewColumn* column = gtk_tree_view_column_new();
   GtkCellRenderer* image_renderer = gtk_cell_renderer_pixbuf_new();
   gtk_tree_view_column_pack_start(column, image_renderer, FALSE);
   gtk_tree_view_column_add_attribute(column, image_renderer,
                                      "pixbuf", FOLDER_ICON);
   GtkCellRenderer* text_renderer = gtk_cell_renderer_text_new();
@@ skipping 14 matching lines @@
   g_object_set_data(G_OBJECT(tree_view), kCellRendererTextKey, text_renderer);
   return tree_view;
 }
 
 GtkCellRenderer* GetCellRendererText(GtkTreeView* tree_view) {
   return static_cast<GtkCellRenderer*>(
       g_object_get_data(G_OBJECT(tree_view), kCellRendererTextKey));
 }
 
 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;
   AddSingleNodeToTreeStore(store, node, &iter, parent);
   if (selected_iter && node->id() == selected_id) {
      // Save the iterator. Since we're using a GtkTreeStore, we're
      // guaranteed that the iterator will remain valid as long as the above
      // appended item exists.
      *selected_iter = iter;
   }
 
   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);
   }
 }
 
 const BookmarkNode* CommitTreeStoreDifferencesBetween(
     BookmarkModel* bb_model, GtkTreeStore* tree_store, GtkTreeIter* selected) {
   const BookmarkNode* node_to_return = NULL;
   GtkTreeModel* tree_model = GTK_TREE_MODEL(tree_store);
 
   GtkTreePath* selected_path = gtk_tree_model_get_path(tree_model, selected);
 
@@ skipping 52 matching lines @@
     ret_val = UTF8ToWide(utf8str);
     g_value_unset(&value);
   } else {
     NOTREACHED() << "Impossible type mismatch";
   }
 
   return ret_val;
 }
 
 }  // namespace bookmark_utils