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

2 files changed, 7 insertions, 6 deletions

diff --git a/chrome/test/live_sync/bookmark_model_verifier.cc b/chrome/test/live_sync/bookmark_model_verifier.cc
index 517a3cc..a827f10 100644
--- a/chrome/test/live_sync/bookmark_model_verifier.cc
+++ b/chrome/test/live_sync/bookmark_model_verifier.cc
@@ -237,9 +237,10 @@ const BookmarkNode* BookmarkModelVerifier::SetURL(BookmarkModel* model,
   const BookmarkNode* v_node = NULL;
   FindNodeInVerifier(model, node, &v_node);
   const BookmarkNode* result = bookmark_utils::ApplyEditsWithNoGroupChange(
-      model, node->GetParent(), node, node->GetTitle(), new_url, NULL);
+      model, node->GetParent(), BookmarkEditor::EditDetails(node),
+      node->GetTitle(), new_url, NULL);
   bookmark_utils::ApplyEditsWithNoGroupChange(verifier_, v_node->GetParent(),
-      v_node, v_node->GetTitle(), new_url, NULL);
+      BookmarkEditor::EditDetails(v_node), v_node->GetTitle(), new_url, NULL);
   return result;
 }
 
diff --git a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
index 78cedd9..368605a 100644
--- a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
@@ -389,10 +389,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
   {
     const BookmarkNode* google_one = GetByUniqueURL(model_one, initial_url);
     const BookmarkNode* google_two = GetByUniqueURL(model_two, initial_url);
-    bookmark_utils::ApplyEditsWithNoGroupChange(model_one, bbn_one, google_one,
-                                                title, second_url, NULL);
-    bookmark_utils::ApplyEditsWithNoGroupChange(model_two, bbn_two, google_two,
-                                                title, third_url, NULL);
+    bookmark_utils::ApplyEditsWithNoGroupChange(model_one, bbn_one,
+        BookmarkEditor::EditDetails(google_one), title, second_url, NULL);
+    bookmark_utils::ApplyEditsWithNoGroupChange(model_two, bbn_two,
+        BookmarkEditor::EditDetails(google_two), title, third_url, NULL);
   }
   ASSERT_TRUE(client1()->AwaitMutualSyncCycleCompletionWithConflict(client2()));
   BookmarkModelVerifier::ExpectModelsMatch(model_one, model_two);