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

chrome/browser/views/bookmark_editor_view.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_VIEWS_BOOKMARK_EDITOR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_
 
 #include <set>
 
 #include "app/tree_node_model.h"
@@ skipping 51 matching lines @@
       if (!title.empty())
         TreeNodeModel::SetTitle(node, title);
     }
 
    private:
     DISALLOW_COPY_AND_ASSIGN(EditorTreeModel);
   };
 
   BookmarkEditorView(Profile* profile,
                      const BookmarkNode* parent,
-                     const BookmarkNode* node,
+                     const EditDetails& details,
                      BookmarkEditor::Configuration configuration,
                      BookmarkEditor::Handler* handler);
 
   virtual ~BookmarkEditorView();
 
   // DialogDelegate methods:
   virtual bool IsDialogButtonEnabled(
       MessageBoxFlags::DialogButton button) const;
   virtual bool IsModal() const;
   virtual std::wstring GetWindowTitle() const;
@@ skipping 77 matching lines @@
   // Expands all the nodes in the tree and selects the parent node of the
   // url we're editing or the most recent parent if the url being editted isn't
   // starred.
   void ExpandAndSelect();
 
   // Creates a returns the new root node. This invokes CreateNodes to do
   // the real work.
   EditorNode* CreateRootNode();
 
   // Adds and creates a child node in b_node for all children of bb_node that
-  // are groups, except for |node_| if editing a folder.
+  // are groups.
   void CreateNodes(const BookmarkNode* bb_node, EditorNode* b_node);
 
   // Returns the node with the specified id, or NULL if one can't be found.
   EditorNode* FindNodeWithID(BookmarkEditorView::EditorNode* node, int64 id);
 
   // Invokes ApplyEdits with the selected node.
   void ApplyEdits();
 
   // Applies the edits done by the user. |parent| gives the parent of the URL
   // being edited.
@@ skipping 27 matching lines @@
   // Creates a new group as a child of the selected node. If no node is
   // selected, the new group is added as a child of the bookmark node. Starts
   // editing on the new gorup as well.
   void NewGroup();
 
   // Creates a new EditorNode as the last child of parent. The new node is
   // added to the model and returned. This does NOT start editing. This is used
   // internally by NewGroup and broken into a separate method for testing.
   EditorNode* AddNewGroup(EditorNode* parent);
 
-  // Returns true if editing a folder.
-  bool IsEditingFolder() const;
-
   // Profile the entry is from.
   Profile* profile_;
 
   // Model driving the TreeView.
   scoped_ptr<EditorTreeModel> tree_model_;
 
   // Displays star groups.
   views::TreeView* tree_view_;
 
   // Used to create a new group.
   scoped_ptr<views::NativeButton> new_group_button_;
 
   // Used for editing the URL.
   views::Textfield url_tf_;
 
   // Used for editing the title.
   views::Textfield title_tf_;
 
-  // Initial parent to select. Is only used if node_ is NULL.
+  // Initial parent to select. Is only used if |details_.existing_node| is
+  // NULL.
   const BookmarkNode* parent_;
 
-  // Node being edited. Is NULL if creating a new node.
-  const BookmarkNode* node_;
+  const EditDetails details_;
 
   // The context menu.
   scoped_ptr<views::SimpleMenuModel> context_menu_contents_;
   scoped_ptr<views::Menu2> context_menu_;
 
   // 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(BookmarkEditorView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_