chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm - Issue 1309583002: [Mac] Enable MacViews bookmark editor behind --enable-mac-views-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/cocoa/bookmarks/bookmark_editor_base_controller.mm

Issue 1309583002: [Mac] Enable MacViews bookmark editor behind --enable-mac-views-dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@modal

Patch Set: Address comments. Created 5 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

« no previous file with comments | « chrome/browser/ui/browser_dialogs.h ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | chrome/browser/ui/views/browser_dialogs_views.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm

index 3dd838c1baac6313e671f4330a75f025fef7d46e..839c1e23213bdd1e6172292ea7a47ebaf0705054 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm

@@ -13,6 +13,7 @@

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

#include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"

#include "chrome/browser/profiles/profile.h"

+#include "chrome/browser/ui/browser_dialogs.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"

@@ -72,6 +73,12 @@ void BookmarkEditor::Show(gfx::NativeWindow parent_window,

Profile* profile,

const EditDetails& details,

Configuration configuration) {

+ if (chrome::ToolkitViewsDialogsEnabled()) {

+ chrome::ShowBookmarkEditorViews(parent_window, profile, details,

+ configuration);

+ return;

+ }

if (details.type == EditDetails::EXISTING_NODE &&

details.existing_node->is_folder()) {

BookmarkNameFolderController* controller =