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

chrome/browser/browser.cc

 // Copyright (c) 2006-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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/keyboard_codes.h"
@@ skipping 1636 matching lines @@
   // confirmation before closing the browser if the user decides so.
   return CanCloseWithInProgressDownloads();
 }
 
 bool Browser::CanBookmarkAllTabs() const {
   BookmarkModel* model = profile()->GetBookmarkModel();
   return (model && model->IsLoaded() && (tab_count() > 1));
 }
 
 void Browser::BookmarkAllTabs() {
-  const BookmarkNode* node = bookmark_utils::CreateBookmarkForAllTabs(this);
-  if (!node)
-    return;
+  BookmarkModel* model = profile()->GetBookmarkModel();
+  DCHECK(model && model->IsLoaded());
+
+  BookmarkEditor::EditDetails details;
+  details.type = BookmarkEditor::EditDetails::NEW_FOLDER;
+  bookmark_utils::GetURLsForOpenTabs(this, &(details.urls));
+  DCHECK(!details.urls.empty());
 
   BookmarkEditor::Show(window()->GetNativeHandle(), profile_,
-                       node->GetParent(), node, BookmarkEditor::SHOW_TREE,
-                       NULL);
+                       model->GetParentForNewNodes(),  details,
+                       BookmarkEditor::SHOW_TREE, NULL);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, TabStripModelObserver implementation:
 
 void Browser::TabInsertedAt(TabContents* contents,
                             int index,
                             bool foreground) {
   contents->set_delegate(this);
   contents->controller().SetWindowID(session_id());
@@ skipping 1240 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }