Chromium Code Reviews| Index: chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc |
| diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc |
| index e618c1843f1e3d7e159aa57a173998600da3df82..25f5465555885a51671eb1821babe1d6b4fbf644 100644 |
| --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc |
| +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc |
| @@ -17,6 +17,8 @@ |
| #include "chrome/browser/bookmarks/bookmark_utils.h" |
| #include "chrome/browser/bookmarks/recently_used_folders_combo_model.h" |
| #include "chrome/browser/profiles/profile.h" |
| +#include "chrome/browser/ui/browser.h" |
| +#include "chrome/browser/ui/browser_list.h" |
| #include "chrome/browser/ui/gtk/gtk_theme_service.h" |
| #include "chrome/browser/ui/gtk/gtk_util.h" |
| #include "chrome/common/chrome_notification_types.h" |
| @@ -306,17 +308,25 @@ void BookmarkBubbleGtk::ShowEditor() { |
| // Commit any edits now. |
| ApplyEdits(); |
| +#if not defined(WEBUI_BOOKMARK_EDITOR) |
|
Rick Byers
2011/08/04 18:26:07
I don't think 'not' is valid, use #if !defined ins
flackr
2011/08/12 18:11:24
Done.
|
| // 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_BOOKMARK_EDITOR) |
| + Browser* browser = BrowserList::GetLastActiveWithProfile(profile_); |
| + DCHECK(browser); |
| + browser->OpenBookmarkManagerEditNode(node->id()); |
| +#else |
| BookmarkEditor::Show(toplevel, profile, NULL, |
| BookmarkEditor::EditDetails(node), |
| BookmarkEditor::SHOW_TREE); |
| +#endif |
| } |
| } |