chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc - Issue 7919028: Revert 101581 - Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc

Issue 7919028: Revert 101581 - 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: 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

« no previous file with comments | « chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

===================================================================

--- chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc (revision 101584)

+++ chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc (working copy)

@@ -366,6 +366,7 @@

const BookmarkNode* node =

profile_->GetBookmarkModel()->GetMostRecentlyAddedNodeForURL(url_);

+#if !defined(WEBUI_DIALOGS)

#if defined(USE_AURA)

NOTIMPLEMENTED();

gfx::NativeView parent = NULL;

@@ -387,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

}