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

chrome/browser/gtk/bookmark_editor_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_GTK_BOOKMARK_EDITOR_GTK_H_
 #define CHROME_BROWSER_GTK_BOOKMARK_EDITOR_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 15 matching lines @@
   FRIEND_TEST(BookmarkEditorGtkTest, EditURLKeepsPosition);
   FRIEND_TEST(BookmarkEditorGtkTest, ModelsMatch);
   FRIEND_TEST(BookmarkEditorGtkTest, MoveToNewParent);
   FRIEND_TEST(BookmarkEditorGtkTest, NewURL);
   FRIEND_TEST(BookmarkEditorGtkTest, ChangeURLNoTree);
   FRIEND_TEST(BookmarkEditorGtkTest, ChangeTitleNoTree);
  public:
   BookmarkEditorGtk(GtkWindow* window,
                     Profile* profile,
                     const BookmarkNode* parent,
-                    const BookmarkNode* node,
+                    const EditDetails& details,
                     BookmarkEditor::Configuration configuration,
                     BookmarkEditor::Handler* handler);
 
   virtual ~BookmarkEditorGtk();
 
   void Show();
   void Close();
 
  private:
   void Init(GtkWindow* parent_window);
@@ skipping 36 matching lines @@
   void ApplyEdits();
 
   // Applies the edits done by the user. |selected_parent| gives the parent of
   // the URL being edited.
   void ApplyEdits(GtkTreeIter* selected_parent);
 
   // Adds a new group parented on |parent| and sets |child| to point to this
   // new group.
   void AddNewGroup(GtkTreeIter* parent, GtkTreeIter* child);
 
-  // Returns true if editing a folder.
-  bool IsEditingFolder() const;
-
   static void OnSelectionChanged(GtkTreeSelection* treeselection,
                                  BookmarkEditorGtk* dialog);
 
   static void OnResponse(GtkDialog* dialog, int response_id,
                          BookmarkEditorGtk* window);
 
   static gboolean OnWindowDeleteEvent(GtkWidget* widget,
                                       GdkEvent* event,
                                       BookmarkEditorGtk* dialog);
 
@@ skipping 19 matching lines @@
   // that we can modify as much as we want and still discard when the user
   // clicks Cancel.
   GtkTreeStore* tree_store_;
 
   // TODO(erg): BookmarkEditorView has an EditorTreeModel object here; convert
   // that into a GObject that implements the interface GtkTreeModel.
 
   // Initial parent to select. Is only used if node_ is NULL.
   const BookmarkNode* parent_;
 
-  // Node being edited. Is NULL if creating a new node.
-  const BookmarkNode* node_;
+  // Details about the node we're editing.
+  const EditDetails details_;
 
   // Mode used to create nodes from.
   BookmarkModel* bb_model_;
 
   // If true, we're running the menu for the bookmark bar or other bookmarks
   // nodes.
   bool running_menu_for_root_;
 
   // Is the tree shown?
   bool show_tree_;
 
   scoped_ptr<BookmarkEditor::Handler> handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkEditorGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_BOOKMARK_EDITOR_GTK_H_