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

makes it so that bookmark all tabs only creates the folder if the user
presses ok. I wasn't happy adding another random arg to
BookmarkEditor::Show, so I added in a structure an enum. This makes it
clearer what Show should do.

I also fixed the following:
. On gtk we wouldn't always pick the right parent for nodes.
. The context menu item is now enabled on views/gtk.

And this now breaks the mac side. I'll straighten that out right after
landing this.

BUG=24367
TEST=Make sure 'bookmark all tabs' works, as well as the bookmark
editor work. (get to the bookmark editor by creating a new bookmark,
then clicking edit, or right clicking a bookmark on the bookmark bar and
choosing edit).

Review URL: http://codereview.chromium.org/271115

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29343 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 8 deletions

diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h
index 571c9ff..f2d6498 100644
--- a/chrome/browser/views/bookmark_editor_view.h
+++ b/chrome/browser/views/bookmark_editor_view.h
@@ -69,7 +69,7 @@ class BookmarkEditorView : public BookmarkEditor,
 
   BookmarkEditorView(Profile* profile,
                      const BookmarkNode* parent,
-                     const BookmarkNode* node,
+                     const EditDetails& details,
                      BookmarkEditor::Configuration configuration,
                      BookmarkEditor::Handler* handler);
 
@@ -167,7 +167,7 @@ class BookmarkEditorView : public BookmarkEditor,
   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.
@@ -215,9 +215,6 @@ class BookmarkEditorView : public BookmarkEditor,
   // 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_;
 
@@ -236,11 +233,11 @@ class BookmarkEditorView : public BookmarkEditor,
   // 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_;