chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm - Issue 12276010: Factor out uses of the WebContentsModalDialog interface from platform-independent code

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/tab_modal_confirm_dialog_mac.mm

Issue 12276010: Factor out uses of the WebContentsModalDialog interface from platform-independent code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove incorrect override Created 7 years, 10 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/tab_modal_confirm_dialog_mac.h ('k') | chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm

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

index a431b22d19de463127ea414bdd41cd95cf1d9917..ffc806fa697e54fc8c96d152c8b8cd958e240944 100644

--- a/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm

+++ b/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm

@@ -77,7 +77,7 @@ TabModalConfirmDialogMac::TabModalConfirmDialogMac(

[[CustomConstrainedWindowSheet alloc]

initWithCustomWindow:[alert_ window]]);

window_.reset(new ConstrainedWindowMac(this, web_contents, sheet));

- delegate->set_window(window_.get());

+ delegate_->set_close_delegate(this);

}

TabModalConfirmDialogMac::~TabModalConfirmDialogMac() {

@@ -91,6 +91,10 @@ void TabModalConfirmDialogMac::CancelTabModalDialog() {

delegate_->Cancel();

}

+void TabModalConfirmDialogMac::CloseDialog() {

+ window_->CloseWebContentsModalDialog();

void TabModalConfirmDialogMac::OnConstrainedWindowClosed(

ConstrainedWindowMac* window) {

delete this;