chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm - Issue 2065803002: Make ChromeExtensionChooserDialog::ShowDialog work for MacViews

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/extensions/chooser_dialog_cocoa.mm

Issue 2065803002: Make ChromeExtensionChooserDialog::ShowDialog work for MacViews (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: removed TODO comments Created 4 years, 6 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/cocoa/chooser_content_view_cocoa.mm ('k') | chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h » ('j') | chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm

index 2e7a2c2cfaa8f32cbadb5e76ba000201d4cfcb7d..6b35b71c29ff36433e947b569c2d9f655474402d 100644

--- a/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm

+++ b/chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.mm

@@ -9,6 +9,7 @@

#include "base/single_thread_task_runner.h"

#include "base/threading/thread_task_runner_handle.h"

#include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"

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

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"

#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"

#import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h"

@@ -64,6 +65,8 @@ void ChooserDialogCocoa::Dismissed() {

void ChromeExtensionChooserDialog::ShowDialog(

ChooserController* chooser_controller) const {

+ if (chrome::ToolkitViewsWebUIDialogsEnabled())

+ return ChromeExtensionChooserDialog::ShowDialogImpl(chooser_controller);

tapted 2016/06/14 08:49:03 nit: blank line after

juncai 2016/06/14 18:08:22 Done.

web_modal::WebContentsModalDialogManager* manager =

web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);

if (manager) {