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

chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc

Index: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
===================================================================
--- chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc	(revision 101786)
+++ chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc	(working copy)
@@ -35,10 +35,6 @@
 #include "views/layout/layout_constants.h"
 #include "views/window/client_view.h"
 
-#if defined(TOOLKIT_USES_GTK)
-#include "views/widget/native_widget_gtk.h"
-#endif
-
 using views::ColumnSet;
 using views::GridLayout;
 
@@ -370,6 +366,7 @@
   const BookmarkNode* node =
       profile_->GetBookmarkModel()->GetMostRecentlyAddedNodeForURL(url_);
 
+#if !defined(WEBUI_DIALOGS)
 #if defined(USE_AURA)
   NOTIMPLEMENTED();
   gfx::NativeView parent = NULL;
@@ -391,15 +388,22 @@
       static_cast<views::NativeWidgetGtk*>(GetWidget()->native_widget())->
           GetTransientParent());
 #endif
+#endif
 
   // Even though we just hid the window, we need to invoke Close to schedule
   // the delete and all that.
   Close();
 
   if (node) {
-    BookmarkEditor::Show(parent, profile_,
-                         BookmarkEditor::EditDetails::EditNode(node),
+#if defined(WEBUI_DIALOGS)
+    Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
+    DCHECK(browser);
+    browser->OpenBookmarkManagerEditNode(node->id());
+#else
+    BookmarkEditor::Show(parent, profile_, NULL,
+                         BookmarkEditor::EditDetails(node),
                          BookmarkEditor::SHOW_TREE);
+#endif
   }
 }
 
Property changes on: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
___________________________________________________________________
Added: svn:mergeinfo