chrome/browser/ui/cocoa/login_prompt_cocoa.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/login_prompt_cocoa.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 CloseWebContentsModalDialog call from ConstrainedWebDialogDelegateBase 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/constrained_web_dialog_delegate_mac.mm ('k') | chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b3dde5f02daea378464ba2609cbce3d61285c5a2..47a563ae7907dbd79559a343db68ada5e264763b 100644

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

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

@@ -77,16 +77,20 @@ class LoginHandlerMac : public LoginHandler,

initWithCustomWindow:[sheet_controller_ window]]);

constrained_window_.reset(new ConstrainedWindowMac(

this, requesting_contents, sheet));

- SetDialog(constrained_window_.get());

NotifyAuthNeeded();

}

+ virtual void CloseDialog() OVERRIDE {

+ // The hosting WebContentsModalDialog may have been freed.

+ if (constrained_window_.get())

sail 2013/02/16 21:45:22 don't need .get()

Mike Wittman 2013/02/19 19:08:36 Done.

+ constrained_window_->CloseWebContentsModalDialog();

+ }

// Overridden from ConstrainedWindowMacDelegate:

virtual void OnConstrainedWindowClosed(

ConstrainedWindowMac* window) OVERRIDE {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- SetDialog(NULL);

SetModel(NULL);

ReleaseSoon();