Chromium Code Reviews| 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 9539a6f1e23ebd92827f540e60654699e12ecd35..d84fb0b9e2efca3f5384a0c6487ed87495827f4f 100644 |
| --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc |
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc |
| @@ -363,14 +363,12 @@ void BookmarkBubbleView::HandleButtonPressed(views::Button* sender) { |
| void BookmarkBubbleView::ShowEditor() { |
| #if defined(TOUCH_UI) |
| - // TODO(saintlou): this brings up a modal window that can't be dismissed |
| - // on touch and is tracked in chromium-os by crosbug.com/13899 |
| bubble_->set_fade_away_on_close(true); |
| - Close(); |
| -#else |
| +#endif |
|
Rick Byers
2011/08/04 18:26:07
I think you should probably remove this whole #if
flackr
2011/08/12 18:11:24
Done.
|
| const BookmarkNode* node = |
| profile_->GetBookmarkModel()->GetMostRecentlyAddedNodeForURL(url_); |
| +#if not defined(WEBUI_BOOKMARK_EDITOR) |
| #if defined(OS_WIN) |
| // Parent the editor to our root ancestor (not the root we're in, as that |
| // is the info bubble and will close shortly). |
| @@ -389,17 +387,23 @@ 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_BOOKMARK_EDITOR) |
| + Browser* browser = BrowserList::GetLastActiveWithProfile(profile_); |
| + DCHECK(browser); |
| + browser->OpenBookmarkManagerEditNode(node->id()); |
| +#else |
| BookmarkEditor::Show(parent, profile_, NULL, |
| BookmarkEditor::EditDetails(node), |
| BookmarkEditor::SHOW_TREE); |
| - } |
| #endif |
| + } |
| } |
| void BookmarkBubbleView::ApplyEdits() { |