Revert 101581 - Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
@@ skipping 570 matching lines @@
   if (node->is_folder()) {
     BookmarkNameFolderController* controller =
         [[BookmarkNameFolderController alloc]
           initWithParentWindow:[[self view] window]
                        profile:browser_->profile()
                           node:node];
     [controller runAsModalSheet];
     return;
   }
 
-  // This jumps to a platform-common routine at this point (which may just
-  // jump back to objc or may use the WebUI dialog).
+#if defined(WEBUI_DIALOGS)
+  browser_->OpenBookmarkManagerEditNode(node->id());
+#else
+  // There is no real need to jump to a platform-common routine at
+  // this point (which just jumps back to objc) other than consistency
+  // across platforms.
   //
   // TODO(jrg): identify when we NO_TREE.  I can see it in the code
   // for the other platforms but can't find a way to trigger it in the
   // UI.
   BookmarkEditor::Show([[self view] window],
                        browser_->profile(),
-                       BookmarkEditor::EditDetails::EditNode(node),
+                       node->parent(),
+                       BookmarkEditor::EditDetails(node),
                        BookmarkEditor::SHOW_TREE);
+#endif
 }
 
 - (IBAction)cutBookmark:(id)sender {
   const BookmarkNode* node = [self nodeFromMenuItem:sender];
   if (node) {
     std::vector<const BookmarkNode*> nodes;
     nodes.push_back(node);
     bookmark_utils::CopyToClipboard(bookmarkModel_, nodes, true);
   }
 }
@@ skipping 57 matching lines @@
         UserMetricsAction("OpenAllBookmarksIncognitoWindow"));
   }
 }
 
 // May be called from the bar or from a folder button.
 // If called from a button, that button becomes the parent.
 - (IBAction)addPage:(id)sender {
   const BookmarkNode* parent = [self nodeFromMenuItem:sender];
   if (!parent)
     parent = bookmarkModel_->bookmark_bar_node();
+#if defined(WEBUI_DIALOGS)
+  browser_->OpenBookmarkManagerAddNodeIn(parent->id());
+#else
   BookmarkEditor::Show([[self view] window],
                        browser_->profile(),
-                       BookmarkEditor::EditDetails::AddNodeInFolder(parent),
+                       parent,
+                       BookmarkEditor::EditDetails(),
                        BookmarkEditor::SHOW_TREE);
+#endif
 }
 
 // Might be called from the context menu over the bar OR over a
 // button.  If called from a button, that button becomes a sibling of
 // the new node.  If called from the bar, add to the end of the bar.
 - (IBAction)addFolder:(id)sender {
   const BookmarkNode* senderNode = [self nodeFromMenuItem:sender];
   const BookmarkNode* parent = NULL;
   int newIndex = 0;
   // If triggered from the bar, folder or "others" folder - add as a child to
@@ skipping 1787 matching lines @@
 // to minimize touching the object passed in (likely a mock).
 - (void)setButtonContextMenu:(id)menu {
   buttonContextMenu_ = menu;
 }
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 @end