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

chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 #include "base/i18n/rtl.h"
@@ skipping 291 matching lines @@
   return UTF16ToUTF8(node->GetTitle());
 }
 
 void BookmarkBubbleGtk::ShowEditor() {
   const BookmarkNode* node =
       profile_->GetBookmarkModel()->GetMostRecentlyAddedNodeForURL(url_);
 
   // Commit any edits now.
   ApplyEdits();
 
-#if !defined(WEBUI_DIALOGS)
   // Closing might delete us, so we'll cache what we need on the stack.
   Profile* profile = profile_;
   GtkWindow* toplevel = GTK_WINDOW(gtk_widget_get_toplevel(anchor_));
-#endif
 
   // Close the bubble, deleting the C++ objects, etc.
   bubble_->Close();
 
   if (node) {
-#if defined(WEBUI_DIALOGS)
-    Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
-    DCHECK(browser);
-    browser->OpenBookmarkManagerEditNode(node->id());
-#else
-    BookmarkEditor::Show(toplevel, profile, NULL,
-                         BookmarkEditor::EditDetails(node),
+    BookmarkEditor::Show(toplevel, profile,
+                         BookmarkEditor::EditDetails::EditNode(node),
                          BookmarkEditor::SHOW_TREE);
-#endif
   }
 }
 
 void BookmarkBubbleGtk::InitFolderComboModel() {
   const BookmarkNode* node =
       profile_->GetBookmarkModel()->GetMostRecentlyAddedNodeForURL(url_);
   DCHECK(node);
 
   folder_combo_model_.reset(new RecentlyUsedFoldersComboModel(
       profile_->GetBookmarkModel(), node));
 
   // We always have nodes + 1 entries in the combo.  The last entry will be
   // the 'Select another folder...' entry that opens the bookmark editor.
   for (int i = 0; i < folder_combo_model_->GetItemCount(); ++i) {
     gtk_combo_box_append_text(GTK_COMBO_BOX(folder_combo_),
         UTF16ToUTF8(folder_combo_model_->GetItemAt(i)).c_str());
   }
 
   gtk_combo_box_set_active(GTK_COMBO_BOX(folder_combo_),
                            folder_combo_model_->node_parent_index());
 }