Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc

Issue 7957002: Reland add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk. Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f0b57aba2024a926388573604f2f0e1934b77abf..4ace196b3f4db319ae8f7d68cf9fd40c0dfffd11 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
@@ -309,25 +309,17 @@ void BookmarkBubbleGtk::ShowEditor() {
// 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
}
}
« no previous file with comments | « chrome/browser/ui/cocoa/hung_renderer_controller.mm ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698