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

chrome/browser/gtk/bookmark_manager_gtk.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_manager_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <vector>
 
 #include "app/gtk_dnd_util.h"
@@ skipping 206 matching lines @@
   BookmarkNodeAdded(model, new_parent, new_index);
 }
 
 void BookmarkManagerGtk::BookmarkNodeAdded(BookmarkModel* model,
                                            const BookmarkNode* parent,
                                            int index) {
   const BookmarkNode* node = parent->GetChild(index);
   if (node->is_folder()) {
     GtkTreeIter iter = { 0, };
     if (RecursiveFind(GTK_TREE_MODEL(left_store_), &iter, parent->id()))
-      bookmark_utils::AddToTreeStoreAt(node, 0, NULL, left_store_, NULL, &iter);
+      bookmark_utils::AddToTreeStoreAt(node, 0, left_store_, NULL, &iter);
   }
 }
 
 void BookmarkManagerGtk::BookmarkNodeRemoved(BookmarkModel* model,
                                              const BookmarkNode* parent,
                                              int old_index,
                                              const BookmarkNode* node) {
   if (node->is_folder()) {
     GtkTreeIter iter = { 0, };
     if (RecursiveFind(GTK_TREE_MODEL(left_store_), &iter, node->id())) {
@@ skipping 370 matching lines @@
 
   organize_menu_.reset(new BookmarkContextMenuGtk(GTK_WINDOW(window_), profile_,
       NULL, NULL, parent, nodes,
       BookmarkContextMenuGtk::BOOKMARK_MANAGER_ORGANIZE_MENU, NULL));
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(organize_), organize_menu_->menu());
 }
 
 void BookmarkManagerGtk::BuildLeftStore() {
   GtkTreeIter select_iter;
   bookmark_utils::AddToTreeStore(model_,
-      model_->GetBookmarkBarNode()->id(), NULL, left_store_, &select_iter);
+      model_->GetBookmarkBarNode()->id(), left_store_, &select_iter);
   gtk_tree_selection_select_iter(left_selection(), &select_iter);
 
   // TODO(estade): is there a decent stock icon we can use here?
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   gtk_tree_store_append(left_store_, &select_iter, NULL);
   gtk_tree_store_set(left_store_, &select_iter,
       bookmark_utils::FOLDER_ICON,
       rb.GetPixbufNamed(IDR_BOOKMARK_MANAGER_RECENT_ICON),
       bookmark_utils::FOLDER_NAME,
       l10n_util::GetStringUTF8(
@@ skipping 799 matching lines @@
       modifier & gtk_accelerator_get_default_mod_mask());
   // The only accelerator we have registered is ctrl+w, so any other value is a
   // non-fatal error.
   DCHECK_EQ(keyval, static_cast<guint>(GDK_w));
   DCHECK_EQ(modifier, GDK_CONTROL_MASK);
 
   gtk_widget_destroy(bookmark_manager->window_);
 
   return TRUE;
 }