Reland add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs.

chrome/browser/ui/cocoa/browser_window_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/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 1611 matching lines @@
   bookmarkBubbleController_ = nil;
 }
 
 // Handle the editBookmarkNode: action sent from bookmark bubble controllers.
 - (void)editBookmarkNode:(id)sender {
   BOOL responds = [sender respondsToSelector:@selector(node)];
   DCHECK(responds);
   if (responds) {
     const BookmarkNode* node = [sender node];
     if (node) {
-#if defined(WEBUI_DIALOGS)
-      DCHECK(browser_);
-      browser_->OpenBookmarkManagerEditNode(node->id());
-#else
       // A BookmarkEditorController is a sheet that owns itself, and
       // deallocates itself when closed.
       [[[BookmarkEditorController alloc]
          initWithParentWindow:[self window]
                       profile:browser_->profile()
                        parent:node->parent()
                          node:node
                 configuration:BookmarkEditor::SHOW_TREE]
         runAsModalSheet];
-#endif
     }
   }
 }
 
 // If the browser is in incognito mode or has multi-profiles, install the image
 // view to decorate the window at the upper right. Use the same base y
 // coordinate as the tab strip.
 - (void)installAvatar {
   // Only install if this browser window is OTR and has a tab strip.
   if (![self shouldShowAvatar])
@@ skipping 506 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)