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

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

Issue 7670041: Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 4 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/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 53393e66d44a2ff063785efa02281e553c5f9697..c053492f7157d0e186a3bc506e6a2ea5d58d425b 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -365,7 +365,6 @@ void BookmarkBubbleView::ShowEditor() {
const BookmarkNode* node =
profile_->GetBookmarkModel()->GetMostRecentlyAddedNodeForURL(url_);
-#if !defined(WEBUI_DIALOGS)
#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).
@@ -384,22 +383,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
}
}

Powered by Google App Engine
This is Rietveld 408576698