| Index: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
|
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
|
| index 529a13ee75f9d68f81eb873acd2609b79ac3ae2d..108d2f4efdf0f5dd54f8bc649f59367344918d9d 100644
|
| --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
|
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
|
| @@ -35,6 +35,10 @@
|
| #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;
|
|
|
| @@ -366,7 +370,6 @@ void BookmarkBubbleView::ShowEditor() {
|
| const BookmarkNode* node =
|
| profile_->GetBookmarkModel()->GetMostRecentlyAddedNodeForURL(url_);
|
|
|
| -#if !defined(WEBUI_DIALOGS)
|
| #if defined(USE_AURA)
|
| NOTIMPLEMENTED();
|
| gfx::NativeView parent = NULL;
|
| @@ -388,22 +391,15 @@ void BookmarkBubbleView::ShowEditor() {
|
| 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) {
|
| -#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(parent, profile_,
|
| + BookmarkEditor::EditDetails::EditNode(node),
|
| BookmarkEditor::SHOW_TREE);
|
| -#endif
|
| }
|
| }
|
|
|
|
|